valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,873 Commits 24 Branches 182 Tags 341 MiB
c0d5ebdd8a
Commit Graph

69873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
c0d5ebdd8a Check for Server os before checking 2016-11-03 10:31:32 -07:00
Nicole Thomas
80a99c4cc5 Merge pull request #37430 from meaksh/zypper-dist-upgrade-debug-solver-fix-2016.3 
Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade (2016.3)
 2016-11-03 08:35:46 -06:00
Mike Place
67cc7a7dc4 Fix incorrect reference of __utils__ in salt.utils (#37428) 
Closes #37388
 2016-11-03 08:33:40 -06:00
Pablo Suárez Hernández
ffc596f215 Including resolver params for Zypper debug-solver 
Now '--no-allow-vendor-change' and '--from' parameters are included
into the zypper --debug-solver call before performing a dry-run dist-upgrade.
 2016-11-03 08:34:26 +00:00
Nicole Thomas
7864f9b79d Merge pull request #37419 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-02 15:40:04 -06:00
Erik Johnson
d749567f1e Fix regression in output for Ctrl-c'ed CLI jobs (#37416) 
https://github.com/saltstack/salt/pull/37115 backported a fix from
develop into 2016.3 and inadvertently broke a fix that I had initially
submitted in https://github.com/saltstack/salt/pull/36750. This commit
corrects this regression.
 2016-11-02 13:34:53 -06:00
Aditya Kulkarni
e9b4620fac Add unit tests for cloning from snapshot (#37414) 2016-11-02 11:22:37 -06:00
rallytime
bce47c9175 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-02 11:18:20 -06:00
Mike Place
ecd794a233 Merge pull request #37404 from saltstack/revert-37401-bootstrap_delay 
Revert "Bootstrap delay option for salt-cloud"
 2016-11-02 22:48:52 +13:00
Mike Place
e864de8f03 Revert "Bootstrap delay option for salt-cloud" 2016-11-02 22:48:39 +13:00
Mike Place
2eb44fbd11 Merge pull request #37401 from cachedout/bootstrap_delay 
Bootstrap delay option for salt-cloud
 2016-11-02 22:02:13 +13:00
Mike Place
6e42b0e157
Bootstrap delay option for salt-cloud 2016-11-02 22:01:20 +13:00
Mike Place
9446e48da0 Merge pull request #37350 from pass-by-value/full_and_linked_clone_v1 
Add handling for full and linked clone
 2016-11-02 21:02:29 +13:00
Mike Place
c7f4d7f76a Merge pull request #37386 from rallytime/fix-34841 
Fix win_useradd.chgroups return when cmd.run_all retcode != 0
 2016-11-02 19:34:12 +13:00
Mike Place
34b6c6459a Merge pull request #37390 from rallytime/fix-34263 
Don't insert __pub* keys into dnsmasq config file with set_config function
 2016-11-02 19:31:53 +13:00
Mike Place
798b2acbe3 Merge pull request #37391 from rallytime/bp-35287 
Back-port #35287 to 2016.3
 2016-11-02 19:18:26 +13:00
Mike Place
7b1d3b5562 Merge pull request #37392 from rallytime/bp-33190 
Back-port #33190 to 2015.8
 2016-11-02 19:18:13 +13:00
Jason Portnoy
4063bae5de catch None cases for comments in jboss7 state module 2016-11-01 15:56:31 -06:00
Derek Maciel
0e1ebea5a4 Simplify return value to "True". 
It is fine to return True here because, in the event that the directory
cannot be created, an exception can be raised anyway.
 2016-11-01 15:54:36 -06:00
Derek Maciel
13022c5cc4 return value for mkdir instead of None 2016-11-01 15:54:36 -06:00
rallytime
e082ff538b Fix failing test now that we're raising a CommandExecutionError 
Also adds a test to check that the CommandExecutionError is raised
when the filename is not present.
 2016-11-01 15:51:09 -06:00
rallytime
c6a3476abb Filter out the __pub keys passed via **kwargs for dnsmasq.set_config 
Fixes #34263
 2016-11-01 14:32:54 -06:00
rallytime
fd380c79b9 Add test case to reproduce dnsmasq.set_config failure in #34263 2016-11-01 14:31:14 -06:00
rallytime
c70492a1fe Fix win_useradd.chgroups return when cmd.run_all retcode != 0 
Fixes #34841

When calling user.chgroups on a windows system, we were not checking
for the retcode of the `cmd.run_all` call when the localgroup call
failed.

This adds a check to make sure the retcode is 0. If it isn't 0, then
we should be returning False, not True.
 2016-11-01 11:19:23 -06:00
Thomas S Hatch
1a4833b3a1 Merge pull request #37279 from gtmanfred/2016.3 
initialize super class of NamespacedDictWrapper
 2016-11-01 09:12:49 -06:00
Thomas S Hatch
351175931c Merge pull request #37351 from jfindlay/mac_set 
modules.mac_power: give macOS time to change setting
 2016-10-31 13:15:40 -06:00
Aditya Kulkarni
d8b1c9c777 Add handling for full and linked clone 
and commit disk mode additions
 2016-10-31 12:30:49 -04:00
Justin Findlay
0c58056d84 modules.mac_power: give macOS time to change setting 2016-10-31 09:04:57 -06:00
Mike Place
25c987e33a Merge pull request #37340 from cachedout/ill_kill_3 
SIGILL -> SIGKILL in process test
 2016-10-31 21:50:10 +13:00
Mike Place
a6b7417fe9
SIGILL -> SIGKILL in process test 
Fairly sure this was a typo. cc: @s0undt3ch
 2016-10-31 20:54:42 +13:00
Mike Place
7f1654894d Merge pull request #37306 from DSRCorporation/bugs/35480_master_shutdown_no_process_error 
Don't use os.wait() on subprocesses managed by `multiprocessing`.
 2016-10-31 19:55:30 +13:00
Mike Place
bf8ba97d54 Merge pull request #37314 from rallytime/fix-34998 
Document the existence of placementgroup option in ec2 driver
 2016-10-31 19:42:33 +13:00
rallytime
39459ed30b Document the existence of placementgroup option in ec2 driver 2016-10-28 12:51:46 -06:00
Dmitry Kuzmenko
b6937ebaa8 Don't use os.wait() on subprocesses managed by multiprocessing. 
See #35480 for details.
 2016-10-28 17:04:43 +03:00
Mike Place
e0baf4b193 Merge pull request #37219 from alex-zel/fix-freeipa-ldap-groups 
Fix freeipa ldap groups
 2016-10-28 13:33:37 +09:00
Nicole Thomas
7d79ea7844 Update 2016.3.4 release notes (#37285) 2016-10-27 16:07:56 -06:00
Thomas S Hatch
3b62a89e45 Merge pull request #37282 from thatch45/raet_cpub 
add cpub to raet event for compat
 2016-10-27 15:33:48 -06:00
Thomas S Hatch
90f778dbc1 Add func for compat with main event system 2016-10-27 15:28:14 -06:00
Thomas S Hatch
8e52f425e4 add cpub to raet event for compat 2016-10-27 15:13:30 -06:00
Daniel Wallace
597f346d57 initialize super class of NamespacedDictWrapper 
Fixes #37264
 2016-10-27 14:28:01 -05:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
alex-zel
b5b2e7e097 Remove trailing whitespaces 
Remove trailing whitespaces, change line 345 from 'if' to 'elif'
 2016-10-27 09:27:33 +03:00
Mike Place
d0ce3de50c Merge pull request #37252 from vutny/suppress-init-grain-error 
Set logging level to 'info' for message about init system detection
 2016-10-27 15:15:01 +09:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
Nicole Thomas
2087cfce90 Merge pull request #37257 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-26 11:32:36 -06:00
Thomas S Hatch
ea6155c3f4 Merge pull request #37254 from DSRCorporation/bugs/37191_minion_hangs 
Bugs/37191 minion hangs
 2016-10-26 10:28:41 -06:00
rallytime
2066f10d7b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-26 10:16:05 -06:00
Dmitry Kuzmenko
9ee24b2d70 Revert "Don't set the daemon flag for LoggingQueue process." 
This reverts commit c9c45a5d79.
 2016-10-26 17:09:19 +03:00
Denys Havrysh
3f20cc01ed Set logging level to 'info' for message about init system detection 2016-10-26 15:56:28 +03:00
Mike Place
d1a6bb72ac Merge pull request #37218 from darkalia/37187_supervisor_2016.3 
Issue #37187 Do not parse first /proc/1/cmdline binary if it's not *b…
 2016-10-26 10:41:03 +09:00