rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2017-09-27 11:48:39 -04:00
garethgreenaway
1a8cc60bb4
Merge pull request #43772 from gtmanfred/2016.11
...
dont print Minion not responding with quiet
2017-09-27 08:39:17 -07:00
garethgreenaway
0a2a2edf20
Merge branch 'develop' into fix_broken_salt_return
2017-09-27 08:31:05 -07:00
Kees Bos
1de6791069
Fix git-pillar ext_pillar for __env__ usage
...
The env must be mapped from '__env__' before validation of the
env is done. Otherwise it will (naturally) fail, since __env__
in itself will never be a valid branch name.
2017-09-27 17:28:49 +02:00
Nicole Thomas
50eff5e895
Merge pull request #43771 from sdodsley/purefa_docfix
...
Fix documentation portion of module: indent issue corrected to ensure code block ends correctly [purefa]
2017-09-27 11:11:02 -04:00
Nicole Thomas
4ed8a3ce1f
Merge pull request #43760 from terminalmage/fix-legacy_git_pillar-deprecation
...
Fix some regressions in recent legacy git_pillar deprecation
2017-09-27 10:55:18 -04:00
Nicole Thomas
760e391f03
Merge pull request #43567 from assafShapira/develop
...
Fix xen server cloud driver
2017-09-27 10:49:41 -04:00
Nicole Thomas
fbfabbe1e9
Merge pull request #43640 from bodhi-space/infra5292
...
INFRA-5292 - small fix for boto_iam AWS rate limiting errors
2017-09-27 10:48:45 -04:00
Nicole Thomas
3f888753d4
Merge pull request #43732 from twangboy/win_skip_mac_pkg_tests
...
Skip `unit.stats.test_mac_packages` on Windows
2017-09-27 10:48:07 -04:00
Nicole Thomas
92c10689e4
Merge pull request #43757 from eradman/is_windows
...
Fix DeprecationWarning for use of 'salt.utils.is_windows'
2017-09-27 10:47:20 -04:00
Nicole Thomas
fb86935d99
Merge pull request #43761 from Ch3LL/release_2017.7.2
...
Release Notes for 2017.7.2
2017-09-27 10:34:51 -04:00
Nicole Thomas
a48afa7175
Merge pull request #43763 from twangboy/win_fix_test_disk
...
Fix `unit.modules.test_disk` for Windows
2017-09-27 10:32:41 -04:00
Daniel Wallace
0194c60960
dont print Minion not responding with quiet
2017-09-27 08:29:41 -06:00
Nicole Thomas
5ea603cf16
Merge pull request #43767 from twangboy/win_skip_test_snapper
...
Skip `unit.modules.test_snapper` on Windows
2017-09-27 10:10:26 -04:00
Nicole Thomas
77c2c7cbf7
Merge pull request #43759 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-09-27 09:30:37 -04:00
Simon Dodsley
5e4b122b56
Fix ident issue to ensure code block ends correctly
2017-09-27 06:27:52 -07:00
Nicole Thomas
5c203df056
Merge pull request #43748 from rallytime/fix-43737
...
Add message to boto_kinesis modules if boto libs are missing
2017-09-27 09:19:33 -04:00
assaf shapira
000dd8e511
Merge branch 'develop' of https://github.com/assafShapira/salt into develop
2017-09-27 15:28:52 +03:00
assaf shapira
46203c630c
ignore_ssl returned to _get_session
2017-09-27 15:28:46 +03:00
twangboy
b41b9c8378
Skip snapper tests on Windows
2017-09-26 17:12:37 -06:00
Benjamin Schiborr
5c41268dd7
Fix return code of puppet module
...
Fixes #43762 . Successful puppet return codes are 0 and 2. When return code
is 2 salt will fail. puppet.py intercepted that for the json return,
however, the salt job will still fail, because it only parses the return
code of the actual process. This commit changes the actual process to
return 0 for 0 and 2.
2017-09-26 15:32:03 -07:00
twangboy
35505ac966
Honor 80 char limit
2017-09-26 15:52:04 -06:00
twangboy
26b23b37bc
Skip test if missing binaries
2017-09-26 15:51:22 -06:00
Ch3LL
caf5795856
add mac patch notes
2017-09-26 17:27:29 -04:00
Erik Johnson
26a48b9d91
Merge pull request #43753 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-26 16:26:57 -05:00
Erik Johnson
9dee896fb9
Merge pull request #43747 from rallytime/gpg-verification
...
Add GPG Verification section to Contributing Docs
2017-09-26 16:25:37 -05:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes
2017-09-26 17:21:24 -04:00
Nicole Thomas
e7530e268f
Merge pull request #43644 from defanator/boto_rds_parameter_group_fix
...
Several fixes for RDS DB parameter group management
2017-09-26 17:20:20 -04:00
Erik Johnson
8b16300495
Fix some regressions in recent legacy git_pillar deprecation
...
These didn't get caught in PR 42823 because of how we invoke the
git_pillar code. Firstly, the "pillar" argument needed to stay. This is
because even though we're not using it, _external_pillar_data() is still
passing it now that git_pillar is not specially invoked there.
Secondly, since the input comes in as a list, and _external_pillar_data
uses single-asterisk expansion, the repos are passed separately when
they should be passed as a single list. To fix these issues, I've done
the following:
1. Re-introduced the "pillar" argument in git_pillar's ext_pillar
function.
2. Changed the "pillar" variable to avoid confusion with the (unused)
"pillar" argument being passed in.
3. Instead of git_pillar accepting the repos as a list, the ext_pillar
function now uses single-asterisk expansion to make it conform with
how _external_pillar_data() invokes it.
2017-09-26 16:12:55 -05:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/daemons/masterapi.py
- salt/master.py
- salt/runners/cache.py
2017-09-26 16:46:43 -04:00
twangboy
1c01e06097
Only skip test on Windows
2017-09-26 14:36:12 -06:00
twangboy
ec99a3ce3c
Fix lint error
2017-09-26 14:36:11 -06:00
twangboy
61f8a2f7ff
Skip mac specific tests
2017-09-26 14:36:11 -06:00
Nicole Thomas
7a70de19f4
Merge branch '2016.11' into gpg-verification
2017-09-26 16:35:29 -04:00
Eric Radman
617c5b72ac
Fix DeprecationWarning for use of 'salt.utils.is_windows'
2017-09-26 15:13:18 -04:00
rallytime
74d315fd28
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/modules/file.py
- tests/unit/modules/test_file.py
2017-09-26 13:45:10 -04:00
Nicole Thomas
c51891c939
Merge branch 'develop' into storage_policies-gh
2017-09-26 13:21:56 -04:00
Nicole Thomas
6186da6d41
Merge pull request #43746 from eradman/check_perms
...
Only inspect file attribute if lsattr(1) is installed
2017-09-26 13:20:24 -04:00
Nicole Thomas
e216cc17c2
Merge branch 'develop' into boto_rds_parameter_group_fix
2017-09-26 13:14:12 -04:00
Nicole Thomas
0581e684a3
Merge branch 'develop' into infra5292
2017-09-26 13:00:17 -04:00
Nicole Thomas
1cc3ad1c8d
Merge pull request #43733 from terminalmage/issue43729
...
Allow docker_events engine to work with newer docker-py
2017-09-26 12:47:39 -04:00
Nicole Thomas
2581098595
Merge pull request #43731 from twangboy/win_unit_beacons_test_status
...
Fix `unit.beacons.test_status` for Windows
2017-09-26 12:25:11 -04:00
Nicole Thomas
10f3d47498
Merge pull request #43724 from brejoc/2017.7.kubernetes_delete_test
...
Improved delete_deployment test for kubernetes module
2017-09-26 12:19:30 -04:00
Erik Johnson
74379bac9c
Merge pull request #43720 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-26 09:53:04 -05:00
Nicole Thomas
d6c2fc0462
Merge pull request #43730 from eradman/openbsd_zfs
...
Skip ZFS module check on OpenBSD
2017-09-26 10:46:12 -04:00
Nicole Thomas
5d38be4ff7
Merge pull request #43458 from terminalmage/issue42082
...
Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
2017-09-26 10:39:00 -04:00
Nicole Thomas
0c02b59ff1
Merge pull request #43349 from michelsen/add-rethinkdb-external-pillar
...
Added RethinkDB external pillar module
2017-09-26 10:35:57 -04:00
rallytime
5a2593dbd3
Add message to boto_kinesis modules if boto libs are missing
...
Fixes #43737
2017-09-26 10:27:20 -04:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs
...
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
2017-09-26 10:16:56 -04:00
Nicole Thomas
13cc27bdab
Merge pull request #43734 from twangboy/win_unit_test_poudriere
...
Fix `unit.modules.test_poudriere` for Windows
2017-09-26 10:13:46 -04:00
