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,180 Commits 24 Branches 182 Tags 341 MiB
4f79d5a0d1
Commit Graph

70180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Denys Havrysh
121848cc77 Fix obtaining log_granular_levels config setting 2016-11-11 10:08:21 +02: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
Mike Place
902a97575e Merge pull request #37626 from cachedout/issue_37491 
Exit with proper retcode on hard client failures
 2016-11-11 15:38:47 +13:00
Mike Place
845f835177 Merge pull request #37617 from terminalmage/git_pillar-docs 
Clarify docs for git_pillar dynamic env feature
 2016-11-11 14:52:52 +13:00
Jean Praloran
4f16840ef1 add integration test for salt.client.LocalClient.cmd_batch 2016-11-11 14:20:51 +13:00
Mike Place
bab9a729b1
Exit with proper retcode on hard client failures 
Closes #37491
 2016-11-11 14:13:29 +13:00
Mike Place
b6031524e5
Return with proper retcodes in batch mode 
Check for the highest retcode received in batch mode and exit with it.

Also, an integration test for the same.

Closes #37492
 2016-11-11 14:03:29 +13:00
Mike Place
fb27f8b69e Revert change 
This was a totally incorrect change made by me. My fault. Apologies.
 2016-11-11 12:58:39 +13:00
Mike Place
3079d78332 Merge pull request #36627 from sjmh/fix/auth_skip_nomatch 
Skip rest of loop on failed func match
 2016-11-11 12:47:12 +13:00
Erik Johnson
8cdf5dbb51 Clarify docs for git_pillar dynamic env feature 2016-11-10 16:41:51 -06:00
Daniel Wallace
71c2df89a9 remove redundent code 2016-11-10 16:34:21 -06:00
Mike Place
a71e7c77b3 Merge pull request #37600 from mcalmer/fix-timezone-on-SUSE 
change TIMEZONE on SUSE systems (bsc#1008933)
 2016-11-11 10:54:04 +13:00
Mike Place
39b75878cf Merge pull request #37602 from DSRCorporation/bugs/37238_salt_hang_on_master_restart 
Handle master restart in appropriate places using `salt.event` listener.
 2016-11-11 10:53:20 +13:00
Jean Praloran
ead47e4bba update ret dict to avoid hanging 2016-11-11 10:53:07 +13:00
Jean Praloran
0a2f153b6e fix dict key for raw support to avoid exception 2016-11-11 10:52:31 +13:00
Mike Place
019e1a721b Merge pull request #37608 from gtmanfred/2016.3 
allow multiline returns from docker for mac
 2016-11-11 10:48:59 +13:00
Erik Johnson
71032f8da5 Documentation improvements and corrections (#37604) 
An earlier change (178ff08) introduced inaccurate information into the
documentation. This commit corrects that inaccuracy. It also adds some
clarifications to which SSH URL formats are supported, clarification
that the ``branch`` parameter refers to the local branch, and that
``user`` refers to the system user and not the http(s)/ssh auth user.
Lastly, some cleanup of improper RST formatting has been done.
 2016-11-10 14:12:48 -07:00
Daniel Wallace
74aee1e372 allow multiline returns from docker for mac 
Nothing actually specifies the number of lines the docker api returns,
so we need to allow for more than one line to be returned which this
specfic docker returner does
 2016-11-10 13:08:44 -06:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
Dmitry Kuzmenko
d3d987b19c Handle master restart in appropriate places using salt.event listener. 2016-11-10 18:07:09 +03:00
Michael Calmer
3530b542f0 change TIMEZONE on SUSE systems (bsc#1008933) 2016-11-10 11:00:50 +01:00
Denys Havrysh
44cf07fec2 Make CLI options take precedence for setting up logfile_logger 2016-11-10 10:11:56 +02:00
Mike Place
fdd13b4145 Merge pull request #37540 from yhekma/2016.3 
Added prefix to tempfile for template
 2016-11-10 13:37:17 +13:00
Clint Armstrong
5e80accd82 Update for m2crypto changes removing lhash (#37578) 
* Update for m2crypto changes removing lhash

* linting issues
 2016-11-09 13:47:26 -07:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
Denys Havrysh
61afaf1792 Fix setting option attributes when processing log_level and log_file 2016-11-09 10:51:03 +02:00
Mike Place
b01c247ea9 Merge pull request #37553 from rallytime/bp-37521 
Back-port #37521 to 2016.3
 2016-11-09 12:11:07 +13:00
Mike Place
694df30d40 Merge pull request #37565 from rallytime/bp-37549 
Back-port #37549 to 2016.3
 2016-11-09 12:10:25 +13:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562) 
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
 2016-11-08 14:58:33 -07:00
Seth House
ac754dbac5 Skip config type checking for sdb values (#37560) 2016-11-08 14:57:47 -07:00