miromode
7a32e46601
Trim trailing whitespace
2017-05-11 10:07:36 -07:00
Nicole Thomas
5cfaa908aa
Bump code block example in 4 spaces
...
This allows the code-block to be rendered correctly when the docs build.
2017-05-11 10:28:10 -06:00
Nicole Thomas
e9b22dd33f
Merge pull request #41184 from pcn/fix-thorium-save-directory-creation
...
Fix trying to use a directory as a file.
2017-05-11 10:24:14 -06:00
Nicole Thomas
88eabbb57d
Merge pull request #41179 from rallytime/fix-jinja-template-test
...
Split up test asserts in jinja template unit test
2017-05-11 10:23:16 -06:00
Nicole Thomas
191b00a370
Merge pull request #41177 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-11 10:22:21 -06:00
rallytime
bb0f8f32de
Update fingerprint hash type default from md5 to sha256
...
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
2017-05-11 09:33:45 -06:00
rallytime
d4e42b8e74
Use cptc.BaseRestCherryPyTest as test class
2017-05-11 09:09:40 -06:00
rallytime
738681c20f
Pylint fix
2017-05-11 09:03:10 -06:00
Peter C. Norton
19a80c5027
Remove un-needed print, and newlines
2017-05-11 10:34:03 -04:00
herbert.buurman
853dc5406c
utils/minions.py: Fixed case where data is an empty dict resulting in errors.
2017-05-11 10:57:34 +02:00
Peter C. Norton
7fc1a63411
Let's use the built-in method
2017-05-11 01:42:19 -04:00
Peter C. Norton
5c95cb8535
Simplify the copy
2017-05-11 01:40:53 -04:00
Peter C. Norton
a36d19a661
Allows the salt.utils.slack query() to pass args
...
It seems like the query params don't quite allow for
args to be passed.
This now performs a shallow copy of the args that are passed in so they
become query_params that the slack api will consume.
2017-05-11 01:34:39 -04:00
jmarinaro
ffd4c7ef04
Fix package name collisions in chocolatey state
...
Fixes #41185
2017-05-10 19:44:24 -06:00
Peter C. Norton
91255f162a
Fix trying to use a directory as a file.
...
This fixes the thorium file runner.
tgt_dir was getting set to the absolute path, and subsequently an
attempt was made to write to the absolute path (aka the just-created
directory).
This would always fail.
2017-05-10 20:44:48 -04:00
Peter C. Norton
3b50059992
Change docs to match what I see in the code
2017-05-10 19:13:08 -04:00
Nicole Thomas
a6f0da703b
Merge pull request #41176 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-05-10 17:01:30 -06:00
rallytime
6729587d54
Spelling fix
2017-05-10 16:59:39 -06:00
rallytime
3a5419ba3f
Split up test asserts in jinja template unit test
...
Due to a bug in the equality handler, this test was failing on
CentOS 6 running Python 2.7.13. This PR splits up the test assertions
into several different pieces in order to cover all the possible
use cases, but also pass on CentOS 6.
2017-05-10 16:55:37 -06:00
rallytime
4100e2b6a6
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-05-10 15:32:33 -06:00
rallytime
12a75c1108
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-05-10 15:32:23 -06:00
Nicole Thomas
496fa3accd
Merge pull request #41156 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-05-10 15:29:54 -06:00
Nicole Thomas
b136b15330
Merge pull request #41104 from Ch3LL/add_jobs_test
...
Add test to query results of /jobs call in api
2017-05-10 14:11:07 -06:00
Nicole Thomas
ac5bda8839
Merge pull request #41117 from terminalmage/rename_env_blacklist_whitelist
...
Rename the *_env_blacklist config opts to *_saltenv_blacklist
2017-05-10 14:03:23 -06:00
Nicole Thomas
ea6047fc21
Merge pull request #41168 from isbm/isbm-zypper-list-downloaded-bugfix
...
Bugfix: datetime should be returned always in UTC
2017-05-10 14:00:25 -06:00
Nicole Thomas
ca18b4df93
Merge pull request #41170 from lomeroe/bp-41081
...
Backport #41081 to 2016.11
2017-05-10 13:58:52 -06:00
Nicole Thomas
d7ec37b003
Merge pull request #41173 from twangboy/fix_installer
...
Add silent action to MsgBox for Path Actions
2017-05-10 13:57:05 -06:00
Erik Johnson
77ae15e41b
Merge pull request #41155 from rallytime/git-test-fixes
...
Gate and skip git state integration tests when git version is older
2017-05-10 14:53:12 -05:00
rallytime
9014033726
Use LoaderModuleMockMixin for setting up default grains/salt dunders
2017-05-10 13:49:43 -06:00
twangboy
24b11ffdc2
Add release notes
2017-05-10 12:27:45 -06:00
Adam Mendlik
e250a80eb5
Catch exceptions from SSH credential verification
2017-05-10 12:23:43 -06:00
Adam Mendlik
a0d08ed13f
Allow saltify cloud provider to verify Windows credentials
2017-05-10 11:58:55 -06:00
Nicole Thomas
e7b714b6e1
Merge pull request #41171 from terminalmage/remove-git_pillar_warning
...
Remove git_pillar warning from integration suite startup
2017-05-10 11:36:54 -06:00
rallytime
23ee513397
Pylint: Add extra line above function declaration
2017-05-10 11:32:41 -06:00
twangboy
96918dcfa6
Add silent action to MsgBox for Path Actions
2017-05-10 11:22:18 -06:00
Ch3LL
dac16583b7
add test to query results of /jobs call in api
2017-05-10 12:39:17 -04:00
rallytime
c282533612
Use with patch.dict for timezone.__grains__ dictionaries
2017-05-10 10:32:24 -06:00
Erik Johnson
03b5420988
Remove git_pillar warning from integration suite startup
...
This is no longer needed since the git_pillar configuration has been
removed from the suite's master config file now that git_pillar
integration tests have been added.
2017-05-10 11:13:43 -05:00
Nicole Thomas
4b67961707
Merge pull request #21 from terminalmage/rallytime-git-test-fixes
...
Make git version checks into decorators
2017-05-10 09:53:47 -06:00
Erik Johnson
018ec5fff9
Make git version checks into decorators
...
Also fix a bug in one test where edits to a file are made in the current
working directory and not the git repo being used for the test.
2017-05-10 10:40:12 -05:00
lomeroe
2af89f2165
update mock data
2017-05-10 10:33:34 -05:00
lomeroe
b7fa115a59
update win_dns_client tests with correct module names
2017-05-10 10:33:33 -05:00
lomeroe
4d05a22675
Update win_dns_client to use reg.read_value and set_value
2017-05-10 10:33:31 -05:00
Erik Johnson
f9aec673d1
Merge pull request #41152 from twangboy/fix_user_add
...
Fix user.present for Windows/Mac
2017-05-10 09:08:43 -05:00
Bo Maryniuk
bde4d7bbd9
Bugfix: datetime should be returned always in UTC
2017-05-10 15:26:38 +02:00
miromode
7395d27679
ret_config and ret_kwargs in orchestration
2017-05-09 18:16:05 -07:00
coutotyler
7f512c701b
Pass hosts and profile to index_exists() method
2017-05-09 18:11:12 -07:00
Nicole Thomas
53099b8733
Merge pull request #41110 from twangboy/fix_test_pkg
...
Add exeptions to path safety check
2017-05-09 16:44:39 -06:00
Ronald van Zantvoort
24946fef18
gpg renderer: fix gpg_keydir always reverting to default
2017-05-10 00:42:52 +02:00
Nicole Thomas
88e93b7fe5
Merge pull request #41158 from Ch3LL/update_2016.11.5
...
2016.11.5 release notes: add additional commits
2017-05-09 16:41:39 -06:00
