valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,881 Commits 24 Branches 182 Tags 341 MiB
396078d1aa
Commit Graph

31881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
396078d1aa Merge pull request #13446 from anylain/add_traverse_dict_and_list 
Add salt.utils.traverse_dict_and_list()
 2014-06-14 07:23:15 -06:00
Thomas S Hatch
336d034550 Merge pull request #13455 from s0undt3ch/hotfix/jenkins 
Cache the salt client
 2014-06-14 07:20:09 -06:00
Thomas S Hatch
ab6c9a0f23 Merge pull request #13454 from terminalmage/issue13389 
Properly handle branches/tags with slashes in name
 2014-06-14 07:19:48 -06:00
Thomas S Hatch
4e5e6a8645 Merge pull request #13453 from basepi/alternativestestmode13450 
Add test mode conditionals to the alternatives state
 2014-06-14 07:18:34 -06:00
Joseph Hall
9950f72716 Merge pull request #13460 from whiteinge/cloud-events 
Added salt-cloud events to the event list
 2014-06-14 06:02:36 -06:00
panying
a44bced3aa + use traverse_dict_and_list() in more get routines 2014-06-14 15:29:46 +08:00
panying
742607a33f + add test_traverse_dict_and_list 2014-06-14 15:25:02 +08:00
panying
2daff27ea6 * use traverse_dict_and_list() in modules.config 2014-06-14 14:26:28 +08:00
panying
b4ab86cfdc * fix pylint errors 2014-06-14 14:25:10 +08:00
Seth House
d80a5c4886 Added salt-cloud events to the event list 2014-06-13 23:23:55 -06:00
Pedro Algarvio
f4c8cdc5f2 Merge pull request #13452 from whiteinge/smtp-rst-fix 
Fixed rST formatting in smtp_returner
 2014-06-14 00:23:59 +01:00
Seth House
28b0e1f904 Linked training graphic 2014-06-13 17:05:24 -06:00
Thomas S Hatch
bf7d7cdc61 Merge pull request #13451 from rallytime/grains_docs 
Added note about grain lowercase resolution
 2014-06-13 16:58:35 -06:00
Pedro Algarvio
b4786b0d8c Cache the salt client 2014-06-13 23:47:03 +01:00
Erik Johnson
82a5e35a84 Properly handle branches/tags with slashes in name 2014-06-13 17:29:25 -05:00
Erik Johnson
f096a8f5bc Fix single-character variable names 2014-06-13 17:28:53 -05:00
Seth House
5b8a601c30 Removed links to old training classes from sidebar 2014-06-13 16:27:49 -06:00
Erik Johnson
098f83767b Tweak exception handling 
os.remove only generates OSError exceptions, so no need to check for
IOError exceptions.
 2014-06-13 17:27:20 -05:00
Colton Myers
948de0a2f6 Add test mode conditionals to the alternatives state 2014-06-13 16:18:47 -06:00
rallytime
1612be139f Added note about grain lowercase resolution 2014-06-13 16:03:38 -06:00
Seth House
65b1745d82 Fixed rST formatting in smtp_returner 2014-06-13 16:03:26 -06:00
Thomas S Hatch
b26679c3aa lint 2014-06-13 15:42:49 -06:00
Thomas S Hatch
d27c6912b9 Merge pull request #13445 from AccelerationNet/win-wmi-fix-12550 
win_pkg: `_get_msi_software` uses COM instead of WMI
 2014-06-13 15:41:41 -06:00
Thomas S Hatch
bba7556bff add raet and ioflo version reports 2014-06-13 14:53:55 -06:00
Thomas S Hatch
95c15930e8 Print out the libnacl version with version check 2014-06-13 14:50:31 -06:00
Joseph Hall
c95072fb2e Merge pull request #13448 from aboe76/suse_spec_update 
updated suse spec file for 2014.1.5
 2014-06-13 13:26:30 -06:00
Niels Abspoel
c950a14e64 updated suse spec file for 2014.1.5 2014-06-13 21:18:36 +02:00
panying
ce23665f5b Add salt.utils.traverse_dict_and_list() 
Add salt.utils.traverse_dict_and_list() and use it in modules.pillar.get() and modules.grains.get()
 2014-06-14 01:16:07 +08:00
Ryan Davis
e559b33b68 win_pkg: _get_msi_software uses COM instead of WMI 
WMI queries against `Win32_product` have a nasty side effect of
triggering a "repair" operation on all installed software (see
[KB974524][]), which can kill the `TrustedInstaller` service.

Workaround is to use the `WindowsInstaller.Installer` COM object, and
it's [ProductsEx][] property. Unfortunately,
`WindowsInstaller.Installer.ProductsEx` is a "get property" that takes
3 arguments, and [I can't figure out how to call that from
python][SO23497599].

This Runs some powershell (via `cmd.run_all`) to get the name/version
from COM, then parse the results in python to build the dictionary.

Tested by deploying this function as a custom module to a variety of
windows servers and running it, covering:

* no powershell
* powershell v1
* powershell v2

refs #12550

[KB974524]: http://support.microsoft.com/kb/974524
[ProductsEx]: http://msdn.microsoft.com/en-us/library/aa369461%28v=vs.85%29.aspx
[SO23497599]: http://stackoverflow.com/questions/23497599/com-get-property-with-multiple-arguments
 2014-06-13 13:07:06 -04:00
Thomas S Hatch
a350a199b1 Lint 2014-06-13 10:19:39 -06:00
Thomas S Hatch
85ab064398 Merge pull request #13444 from bbinet/debian-network-hotplug 
Fix support for allow-hotplug statement in debian_ip network module
 2014-06-13 10:05:55 -06:00
Thomas S Hatch
c14d799fa2 Merge pull request #13443 from makinacorpus/fixlogic 
Fix the broken check state logic
 2014-06-13 10:04:29 -06:00
Thomas S Hatch
cd50e024a6 Merge pull request #13371 from cachedout/force_refresh 
force_refresh flag
 2014-06-13 10:01:48 -06:00
Bruno Binet
aa12db58fd Fix support for allow-hotplug statement in debian_ip network module 
When an existing interface was configured with allow-hotplug or when setting
"hotplug: True" in network.managed state, this was not taken into account and
the allow-hotplug setting would be removed from /etc/network/interfaces.

This patch fixes this issue.
 2014-06-13 17:11:26 +02:00
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00
Thomas S Hatch
5c3a6da2cb Merge pull request #13441 from garethgreenaway/13256_bug_fixes 
support for managing scheduled jobs added via pillar
 2014-06-12 23:38:36 -06:00
Thomas S Hatch
a2ea66b4ca Merge pull request #13438 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #80
 2014-06-12 23:36:55 -06:00
Thomas S Hatch
b06ac79630 Merge pull request #13435 from scentoni/fix-solaris-mount 
Fixed copy-paste error.
 2014-06-12 23:34:21 -06:00
Gareth J. Greenaway
65fac76dde Adding support to manage scheduled jobs which are added via pillar. Fixing an issue in schedule.reload which caused an exception if the schedule.conf file did not exist. General cleanup. 2014-06-12 21:19:07 -07:00
Pedro Algarvio
c1a954467b Update 'doc/.tx/config' - Build #80 
http://cookingwithsalt.org/job/salt/job/transifex/80/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-06-13 01:20:37 +01:00
Pedro Algarvio
da7e7d71dd Merge pull request #13434 from rallytime/cloud_tests 
Initial cloud provider tests for GoGrid
 2014-06-13 01:08:30 +01:00
Scott Centoni
c9082a7ff2 Fixed thinko. 2014-06-12 16:24:46 -07:00
rallytime
276affe259 Initial cloud provider tests for GoGrid 2014-06-12 17:09:57 -06:00
Thomas S Hatch
d33b01d635 detect the right transport for the client in tests 2014-06-12 16:53:50 -06:00
Thomas S Hatch
cf4c0b62cc Merge pull request #13432 from cachedout/no_minion_delay 
Don't sleep if we don't need to
 2014-06-12 16:49:30 -06:00
Thomas S Hatch
a52255ac10 Merge pull request #13430 from lyft/fix-apache-module-enable-check 
Fix module enable check in apache_module
 2014-06-12 16:48:41 -06:00
Thomas S Hatch
7ba7a21868 Merge pull request #13428 from scentoni/fix-solaris-mount 
Added mount.active functionality for Solaris.
 2014-06-12 16:47:35 -06:00
Thomas S Hatch
b22882f81c Merge pull request #13427 from cachedout/master_start 
Track MWorkers
 2014-06-12 16:43:13 -06:00
Thomas S Hatch
a714607be7 Merge pull request #13425 from UtahDave/mod_setup 
add sqlite to the esky builds
 2014-06-12 16:42:34 -06:00
Mike Place
21db0699ba Don't sleep if we don't need to 
According to #5670, we added a sleep to let a startup_state run
cleanly. This only needs to happen if we have a startup state,
otherwise let's keep our foot on the gas.
 2014-06-12 16:41:47 -06:00