valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,052 Commits 24 Branches 182 Tags 341 MiB
98e25c68aa
Commit Graph

70052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
98e25c68aa Merge pull request #37731 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-16 10:13:02 -07:00
Mike Place
3be9ab4cd0 Warn on AES test for systems with > 1 core (#37724) 
* Warn on AES test for systems with > 1 core

* Whitespace fix
 2016-11-16 09:44:33 -07:00
rallytime
ec1389711f Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-16 09:31:17 -07:00
Thomas S Hatch
35655d521f Merge pull request #37721 from terminalmage/zd909 
Fix for pillar setting 'environment' key in __gen_opts()
 2016-11-16 09:04:53 -07:00
Mike Place
f417dbbe99 Merge pull request #37718 from terminalmage/docs 
Fix incorrectly-formatted RST
 2016-11-16 08:21:08 +00:00
Mike Place
99cda7c003 Merge pull request #37719 from terminalmage/docs-2016.3 
Fix incorrectly-formatted RST (2016.3 branch)
 2016-11-16 08:20:53 +00:00
Erik Johnson
acdd5513da Update git_pillar docs to reflect info from bugfix 2016-11-16 01:41:20 -06:00
Erik Johnson
433737d2dc Fix for pillar setting 'environment' key in __gen_opts() 
7a6e402 added ``environment`` as a key in the master opts. This had the
unfortunate side effect of breaking the dynamic pillar feature in
git_pillar, which relies on pillar setting this opts key to the value
from the minion opts.
 2016-11-16 01:10:54 -06:00
Erik Johnson
f163b4c724 Fix incorrectly-formatted RST 2016-11-15 22:16:09 -06:00
Erik Johnson
23b8b2a3f4 Fix incorrectly-formatted RST 2016-11-15 22:09:32 -06:00
Mike Place
8dea695c7c Merge pull request #37694 from cachedout/npm_git 
Catch differences in git URLs in npm state
 2016-11-16 01:56:18 +00:00
Mike Place
329448ccd7 Merge pull request #37705 from rallytime/fix-37665 
Don't overwrite the "key" variable passed in to _listeners_present func
 2016-11-16 10:26:37 +13:00
Mike Place
ac9a316b50 Merge pull request #37707 from Ch3LL/fix_timeout_azure 
add timeout increase on azure tests
 2016-11-16 10:24:24 +13:00
Ch3LL
363122c675 add timeout increase on azure tests 2016-11-15 10:27:44 -07:00
C. R. Oldham
1ece265354 Merge pull request #37704 from twangboy/fix_test_disabled_2016.3 
Fix test disabled 2016.3 [DO NOT MERGE FORWARD]
 2016-11-15 09:48:52 -07:00
rallytime
3b7e9c5e3b Don't overwrite the "key" variable passed in to _listeners_present func 
Fixes #37665
 2016-11-15 09:47:32 -07:00
twangboy
a0429cf839 Use nfsd instead of apsd for test_disabled 2016-11-15 09:44:42 -07:00
Mike Place
44f05acbff Merge pull request #37690 from twangboy/update_pyzmq_2016.3 
Update pyzmq to 15.3.0 for 2016.3 [DO NOT MERGE FORWARD]
 2016-11-15 16:10:36 +13:00
Mike Place
a743d8b5e6 Merge pull request #37680 from rallytime/bp-32965 
Back-port #32965 to 2016.3
 2016-11-15 15:56:46 +13:00
Mike Place
0e3bc2366a
Catch differences in git URLs in npm state 
There is a case where a salt user might specify git://foo/bar
but the npm package might believe it lives at git://foo/bar.git

This attempts to normalize and account for that difference.
 2016-11-15 15:34:25 +13:00
twangboy
cf55342150 Update pyzmq to version 15.3.0 2016-11-14 17:11:20 -07:00
Mike Place
1c2d6ff293 Merge pull request #37681 from rallytime/bp-35965 
Back-port #35965 to 2016.3
 2016-11-15 10:19:22 +13:00
Nathan Grennan
700f3fa57f Set the return code to 1 on salt-ssh highstate errors 2016-11-14 12:30:33 -07:00
kevin
1865b13645 Fix 'present' option when used without 'key_type' 2016-11-14 12:16:51 -07:00
Nicole Thomas
1b456b55dc Merge pull request #37668 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-14 08:43:24 -07:00
rallytime
ef684c6b02 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-14 08:41:35 -07:00
Mike Place
305e51d1c0 Merge pull request #37625 from cachedout/issue_37492 
Return with proper retcodes in batch mode
 2016-11-12 20:29:09 +00:00
Mike Place
7510cd4da9 Merge pull request #37639 from rallytime/bp-37607 
Back-port #37607 to 2016.3
 2016-11-12 09:29:20 +13:00
Mike Place
24ca96010d Merge pull request #37638 from rallytime/bp-37349 
Back-port #37349 to 2016.3
 2016-11-12 09:29:01 +13:00
Mike Place
e1e8b81d16 Merge pull request #37644 from Ch3LL/fix_37643 
digital ocean list_keypairs: increase limit for ssh keys parsed
 2016-11-12 09:28:46 +13:00
Mike Place
a97c2ad34b Merge pull request #37640 from rallytime/update-release-notes 
Add known issue #37541 to 2016.3.4 release notes
 2016-11-12 09:28:12 +13:00
Mike Place
fab3eaa237 Merge pull request #37642 from cro/rotate_aes_doc 
Forward-port change from 2015.8 adding release note for rotate_aes_key
 2016-11-12 09:27:06 +13:00
Ch3LL
c02961a2f5 list_keypairs: increase limit for ssh keys parsed 2016-11-11 11:11:26 -07:00
rallytime
6d6de12aff Grammatical fix 2016-11-11 11:03:57 -07:00
C. R. Oldham
1ca5b958c6 Forward-port change from 2015.8 adding release note for rotate_aes_key 2016-11-11 10:36:47 -07:00
C. R. Oldham
a01b66556f Add docs for rotate_aes_key (#37641) 2016-11-11 10:30:46 -07:00
rallytime
9914c93bc4 Pylint: Remove kwargs that are not in the 2016.3 branch 2016-11-11 10:22:41 -07:00
rallytime
24d7f20e16 Add known issue #37541 to 2016.3.4 release notes 
Refs #37541
 2016-11-11 09:46:28 -07:00
Mike Place
d941e9354d Disable pylint warning 2016-11-11 09:38:34 -07:00
Mike Place
940ee49a0b Lint fix 2016-11-11 09:38:34 -07:00
Joseph Hall
69893f0c38 Try the connection again, in case it's been reset 2016-11-11 09:38:34 -07:00
Hanoz Elavia
ba2105bc39 Fix for Bug #37118, the wrong parameter was being used to convert the 
group name to group id.
 2016-11-11 09:36:43 -07:00
Mike Place
4c07b3534a Merge pull request #37629 from TronPaul/fix-s3fs-opts 
fix __opts__ and provider being None in salt.utils.aws:get_location
 2016-11-11 22:49:47 +13:00
Mike Place
200d9fcb6e Merge pull request #37481 from thatch45/raet_client 
Raet internal client reference fix
 2016-11-11 17:39:41 +13:00
Mark McGuire
a452cded20 fix __opts__ and provider being None issue 2016-11-10 21:22:33 -06:00
Mike Place
b14faf1c68 Merge pull request #37611 from jeanpralo/fix-cmd-batch-raw 
Fix cmd batch raw
 2016-11-11 15:53:58 +13:00
Mike Place
35c8333d04 Merge pull request #37614 from gtmanfred/2016.3 
remove redundant code
 2016-11-11 15:49:13 +13:00
Mike Place
4fab707bdd Merge pull request #37627 from cachedout/pr-36706 
Exempt pip.iteritems from test_valid_docs test
 2016-11-11 15:48:37 +13:00
Mike Place
94df2f8e6f
Exempt pip.iteritems from test_valid_docs test 2016-11-11 15:47:43 +13:00
Mike Place
ee74f3116e Merge pull request #36706 from siccrusher/fix_env_var_validation 
Add basic sanity checks for env_vars in pip.install function
 2016-11-11 15:47:16 +13:00