valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,238 Commits 24 Branches 182 Tags 341 MiB
85f5e2a443
Commit Graph

56238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
85f5e2a443 Fix failing tests 2015-08-04 09:48:43 -06:00
Mike Place
584d608852 Merge pull request #25978 from alprs/fix-service_test_changes 
Correct service state changes in test mode
 2015-08-04 09:45:26 -06:00
Mike Place
8bc9c51c49 Merge pull request #25982 from sjorge/smartos-modules-tweaks 
salt.modules.smartos_* limit to global zone only
 2015-08-04 08:43:53 -06:00
Mike Place
e2e1d3f044 Merge pull request #25989 from rallytime/bp-25832 
Back-port #25832 to 2015.8
 2015-08-04 08:37:41 -06:00
Mike Place
0450cad00c Merge pull request #25988 from cachedout/issue_25899 
Move #25642 to 2015.8
 2015-08-04 08:37:03 -06:00
Pedro Algarvio
d98cd97edd Merge pull request #25999 from s0undt3ch/2015.8 
Include subschema defaults
 2015-08-04 14:04:08 +01:00
Pedro Algarvio
3d731109d7 Include subschema defaults 2015-08-04 14:03:30 +01:00
Pedro Algarvio
5a892aa5f3 Merge pull request #25997 from s0undt3ch/2015.8 
Allow getting a defaults dictionary from schema defaults
 2015-08-04 13:18:00 +01:00
Pedro Algarvio
d576e00d4e Allow getting a defaults dictionary from schema defaults 2015-08-04 13:15:59 +01:00
Colton Myers
2e792130f4 Merge pull request #25979 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-03 17:15:52 -06:00
Dmitry Kuzmenko
cfbfb349eb Update RaetEvent to conform to the SaltEvent interface. 2015-08-03 16:10:38 -06:00
Dmitry Kuzmenko
5c6276ac7d Subscribe event to bus is optional now 
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
 2015-08-03 16:10:38 -06:00
Mike Place
299875df3d Move #25642 to 2015.8 
Closes #25899
 2015-08-03 15:50:21 -06:00
Jorge Schrauwen
d39bdbde26 salt.modules.smartos_* limit to global zone only 2015-08-03 21:28:27 +00:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
 2015-08-03 14:50:50 -06:00
Andreas Lutro
1bc981ba42 service state: correct result in test mode 
no change should be signalized with True, not None
 2015-08-03 22:44:36 +02:00
Colton Myers
7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-03 14:30:07 -06:00
Thomas S Hatch
10813cadef Merge pull request #25956 from alprs/fix-cron_user 
Fix user argument to cron functions
 2015-08-03 13:40:16 -06:00
Thomas S Hatch
aeb3b4edaf Merge pull request #25946 from sjorge/esky-decorator-fix 
Fix for salt.utils.decorators under esky
 2015-08-03 13:39:32 -06:00
Nicole Thomas
2dca8d959b Merge pull request #25966 from rallytime/bp-25864 
Back-port #25864 to 2015.5
 2015-08-03 12:48:26 -06:00
Nicole Thomas
a6d8e541ed Merge pull request #25967 from rallytime/bp-25917 
Back-port #25917 to 2015.5
 2015-08-03 12:48:02 -06:00
Colton Myers
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -06:00
Colton Myers
87d028b302 Merge pull request #25895 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-08-03 11:12:37 -06:00
Colton Myers
876af79897 Py3 compat 2015-08-03 10:53:05 -06:00
Colton Myers
579ba19c1d Fix lint 2015-08-03 10:52:16 -06:00
Mike Place
0bffcff5e1 Merge pull request #25957 from alprs/fix-file_managed_checkcmd_remove 
Remove temporary file after file.managed with checkcmd
 2015-08-03 10:51:03 -06:00
Colton Myers
56e43c8f88 Fix lint 2015-08-03 10:48:42 -06:00
Nicole Thomas
1ba7e8ebcf Merge pull request #25874 from rallytime/bp-25668 
Back-port #25668 to 2015.8
 2015-08-03 10:40:42 -06:00
Mike Place
15b14b761f Merge pull request #25929 from sjorge/fix-pkgin-module 
salt.module.pkgin's __virtual__() should not return None if pkg_info is not present
 2015-08-03 09:34:15 -06:00
confidential
82b7e14a1f adding missing format string 2015-08-03 09:27:55 -06:00
Petr Demin
0f7f9637b4 #25863 fix - state.pkg: do preflight check only for non-installed packages 2015-08-03 09:26:24 -06:00
Andreas Lutro
60c250af37 file.managed: tmp_filename needs to always be defined 2015-08-03 16:56:28 +02:00
Andreas Lutro
0b10cead06 delete tmp file when file.managed has check_cmd arg 2015-08-03 16:51:57 +02:00
Pedro Algarvio
98955057e0 Merge pull request #25941 from jfindlay/time_lib 
add timelib to dependency versions
 2015-08-03 13:23:42 +01:00
Andreas Lutro
b3c1fa53b9 fix user argument to cron functions 2015-08-03 09:38:54 +02:00
Justin Findlay
c636f7fe9c Merge pull request #25952 from garethgreenaway/2015_8_event_fire_failed_log_why 
Log when event.fire and event.fire_master fail 2015.8
 2015-08-02 18:20:19 -06:00
Justin Findlay
dcc6883b24 Merge pull request #25951 from garethgreenaway/event_fire_failed_log_why 
Log when event.fire and event.fire_master fail.
 2015-08-02 18:19:45 -06:00
Gareth J. Greenaway
e4ac757f0b If we're unable to fire an event, log the cause so we know what happened 2015-08-02 11:15:26 -07:00
Gareth J. Greenaway
7f20454427 If we're unable to fire an event, log the cause so we know what happened 2015-08-02 11:11:32 -07:00
Justin Findlay
cbd539fcf6 Merge pull request #25944 from sjorge/smartos-libcrypto-nonesky-fix 
Smartos libcrypto nonesky fix
 2015-08-01 12:14:43 -06:00
Jorge Schrauwen
bebdc26616 inspect.getmodule fails without .py, using frame and f_global instead. 2015-08-01 12:05:28 +00:00
Jorge Schrauwen
77239fa1ae fix for loading libcrypto on non esky smartos 2015-08-01 10:57:45 +00:00
Jorge Schrauwen
59fcdf985f Merge pull request #2 from saltstack/2015.8 
Sync 2015.8 with upstream
 2015-08-01 01:37:14 +02:00
Justin Findlay
4143cec3bf Merge pull request #25942 from saltstack/lover 
typo in minion doc
 2015-07-31 17:34:55 -06:00
Justin Findlay
7e121de907 Update minion.rst 2015-07-31 17:34:07 -06:00
Justin Findlay
464f7a404c add timelib to dependency versions 
Related to #25850.
 2015-07-31 17:20:12 -06:00
Mike Place
1f20c065b8 Merge pull request #25938 from jacobhammons/syndic-multimaster 
Doc on using syndic with multimaster
 2015-07-31 17:05:05 -06:00
Justin Findlay
76d08d93f4 Merge pull request #25906 from saltstack/dgm_pkgbuild 
Cherry-pick of pkgbuild changes from develop branch
 2015-07-31 16:00:29 -06:00
Jacob Hammons
ac0a8ff711 Doc on using syndic with multimaster 2015-07-31 15:25:15 -06:00
rallytime
a53d0e119f Pylint 2015-07-31 15:11:10 -06:00