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
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
Denys Havrysh
651ed16ad3
Fix Pylint deprecated option warnings
2017-09-27 10:38:47 +03:00
twangboy
b41b9c8378
Skip snapper tests on Windows
2017-09-26 17:12:37 -06:00
Ch3LL
caf5795856
add mac patch notes
2017-09-26 17:27:29 -04: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
88414d5f73
Merge pull request #43756 from gtmanfred/2017.7.2
...
split build and install for pkg osx
2017-09-26 16:51:28 -04: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
Daniel Wallace
f7df41fa94
split build and install for pkg osx
2017-09-26 12:59:23 -06: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
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
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
Nicole Thomas
e580ed4caa
Merge branch '2016.11' into issue43373
2017-09-26 10:10:32 -04:00
Nicole Thomas
41aeee7ac8
Merge pull request #43742 from terminalmage/fix-docstring
...
Fix incorrect value in docstring
2017-09-26 09:54:59 -04:00
Erik Johnson
553335b1c9
Fix incorrect value in docstring
2017-09-26 07:52:59 -05:00
Erik Johnson
023a563657
Merge pull request #43727 from rallytime/fix-43650
...
Revise "Contributing" docs: merge-forwards/release branches explained!
2017-09-26 07:43:15 -05:00
Erik Johnson
d78b9a3294
Merge pull request #41998 from twangboy/win_unit_test_environ
...
Fix `unit.modules.test_environ` for Windows
2017-09-26 07:25:48 -05:00
Erik Johnson
7fbbea3806
Merge pull request #42036 from twangboy/win_unit_test_file
...
Fix `unit.modules.test_file` for Windows
2017-09-26 07:23:09 -05:00
Erik Johnson
6e5c99bda0
Allow docker_events engine to work with newer docker-py
...
The Client attribute was renamed to APIClient in docker-py 2.0
2017-09-26 07:18:33 -05:00
twangboy
922e60fa67
Add os agnostic paths
2017-09-25 15:25:31 -06:00
twangboy
dc1b36b7e2
Change expected return for Windows
2017-09-25 15:06:44 -06:00
Erik Johnson
5b3be6e8af
Fix failing unit test
2017-09-25 16:06:33 -05:00
Erik Johnson
5f90812b12
Fix missing PER_REMOTE_ONLY in cache.clear_git_lock runner
...
This allows for the runner to clear the git lock if any of the
per-remote-only params was present in the configuration.
This also adds PER_REMOTE_ONLY attributes to the winrepo runner and
git_pillar external pillar, and fixes all refs to GitBase's init_remotes
function to include PER_REMOTE_ONLY arguments. This will insulate us
against future headaches if either git_pillar or winrepo gain extra
per-remote-only params, as we will only need to make the change to the
attribute in their respective modules.
2017-09-25 15:17:47 -05:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained!
...
Fixes #43650
The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
2017-09-25 15:23:01 -04:00
twangboy
d73ef44cf6
Mock with uppercase KEY
2017-09-25 09:37:15 -06:00
twangboy
048e16883f
Use uppercase KEY
2017-09-25 09:37:15 -06:00
twangboy
056f3bb4c0
Use with to open temp file
2017-09-25 09:35:25 -06:00
twangboy
352fe69e35
Clarify the purpose of the for loop
2017-09-25 09:35:25 -06:00
twangboy
b55172d5dc
Split by Windows and Linux style line endings
2017-09-25 09:35:24 -06:00
twangboy
e20aa5c39b
Fix line, use os.sep instead of os.linesep
2017-09-25 09:35:24 -06:00
twangboy
d5f27901e3
Fix additional bytestring issue
2017-09-25 09:35:24 -06:00
twangboy
716e99c453
Fix py3 bytestring problems
2017-09-25 09:35:24 -06:00
twangboy
543610570c
Fix bytestring issues, fix errored tests
2017-09-25 09:35:24 -06:00
twangboy
9fe83a34a5
Remove old variable declaration
2017-09-25 09:35:23 -06:00
twangboy
c5cf5e92c1
Fix many tests
2017-09-25 09:35:23 -06:00
Jochen Breuer
85b0a8c401
Improved delete_deployment test for kubernetes module
...
This is a follow up of this PR: https://github.com/saltstack/salt/pull/43235
With the fix in PR 43235, we are polling the status of the deletion via
show_deployment. This is now also reflected in the tests with this change.
2017-09-25 17:29:27 +02:00
nicholasmhughes
d68c5c4be0
prevent exception when test=True
2017-09-25 11:11:23 -04:00
nicholasmhughes
cfe37916c3
handling changes per section
2017-09-25 10:40:02 -04:00
nicholasmhughes
1c484f6ad5
prevent exception when test=True
2017-09-25 10:39:11 -04:00
Nicole Thomas
a81d4b8d8d
Merge pull request #43557 from clan/yaml
...
disable modify yaml constructor
2017-09-25 10:03:47 -04:00
Nicole Thomas
b5beec16e8
Merge pull request #43566 from damon-atkins/2017.7_update_safe_filename_func
...
2017.7 update salt.utils.files.safe_filepath func
2017-09-25 09:58:28 -04:00
