valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
55,114 Commits 24 Branches 182 Tags 341 MiB
01e96bca11
Commit Graph

55114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Hammons
01e96bca11 sphinx html theme updates - color changes for warning on development branch 2015-06-26 08:23:58 -06:00
Joseph Hall
99822b1792 Merge pull request #24946 from rallytime/driver-provider-gce 
Change provider --> driver for gce create function
 2015-06-26 06:25:57 -06:00
Nicole Thomas
a15f9f8b56 Merge pull request #24971 from rallytime/azure_min_ver 
Add minimum Python Azure SDK version to azure docs.
 2015-06-25 17:18:22 -06:00
Colton Myers
f65e663353 Merge pull request #24937 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-25 16:03:47 -06:00
Mike Place
8e60cc2c3c Merge pull request #24976 from cachedout/issue_19130 
Catch typeerror on msgpack failure
 2015-06-25 16:02:04 -06:00
Mike Place
9680996a2d Catch typeerror on msgpack failure 2015-06-25 16:01:28 -06:00
Mike Place
2dbdffdd5f Merge pull request #24973 from ezheidtmann/patch-2 
Fix typo: `Gcomment` should be `comment`
 2015-06-25 15:49:45 -06:00
Mike Place
986133772f Merge pull request #24974 from cachedout/issue_23613 
Remove duplicate func doc
 2015-06-25 15:49:19 -06:00
Mike Place
fbea069319 Remove duplicate func doc 
Closes #23613
 2015-06-25 15:48:44 -06:00
Evan Heidtmann
160b3db85d Fix typo: Gcomment should be comment 2015-06-25 14:45:19 -07:00
Mike Place
e01291c6a9 Merge pull request #24972 from cachedout/grains_fix 
Set grains test to local
 2015-06-25 15:30:40 -06:00
Mike Place
d48af16594 Set grains test to local 2015-06-25 15:30:16 -06:00
rallytime
4ac8a9460a Add minimum Python Azure SDK verion to azure docs. 2015-06-25 15:26:50 -06:00
Colton Myers
63667e0d49 Add more side effects 2015-06-25 14:08:47 -06:00
Mike Place
e915465684 Merge pull request #24957 from batulin-s/check_use_flags_ebuild 
main fix behavior pkg.latest state and pkg.install module for working…
 2015-06-25 14:03:24 -06:00
Mike Place
8f44506cd9 Merge pull request #24729 from gladiatr72/gpg_encrypt-decrypt__add_bare_kwarg 
boolean option `bare` for modules.gpg.(en|de)crypt()
 2015-06-25 14:00:20 -06:00
Mike Place
0dc2a21834 Merge pull request #24877 from mzupan/fix-rabbit-policy 
Fix for rabbitmq policy changes on vhosts
 2015-06-25 13:15:22 -06:00
Mike Place
7c66611fe2 Merge pull request #24952 from pcn/patch-1 
Don't split the string on a single line
 2015-06-25 12:50:26 -06:00
Seth House
925c32cebd Merge pull request #24954 from pengyao/netapi_stop 
netapi client should create after daemonize
 2015-06-25 12:50:15 -06:00
Colton Myers
0d95be1e94 Fix bug in ssh_auth state 
If test=True, we only have result=None *if changes would be made*.

If everything is in order, it should return result=True
 2015-06-25 12:47:47 -06:00
Mike Place
a9f04915b4 Merge pull request #24967 from cachedout/cmdmod_doc 
Cmdmod doc
 2015-06-25 12:47:39 -06:00
Colton Myers
880760f813 Fix ssh_auth test 2015-06-25 11:17:00 -06:00
Colton Myers
8b23cb0b9c Revert just config changes 2015-06-25 11:15:32 -06:00
Colton Myers
23d02be94d Revert "Revert wildly in an attempt to make tests pass" 
This reverts commit 2d916c3ba1.
 2015-06-25 11:15:09 -06:00
Mike Place
97c50ee680 Lint 2015-06-25 10:36:05 -06:00
Mike Place
f67993f100 Document additional functions 2015-06-25 10:34:54 -06:00
Mike Place
72ca156b7f Document 'run' and 'script' 2015-06-25 10:21:55 -06:00
Colton Myers
2d916c3ba1 Revert wildly in an attempt to make tests pass 2015-06-25 10:11:43 -06:00
rallytime
fc3677de65 Pylint 2015-06-25 09:52:16 -06:00
sergey.b
768497ce34 fix PEP8 mistakes 2015-06-25 16:45:51 +03:00
sergey.b
c7519f9ac0 main fix behavior pkg.latest state and pkg.install module for working with gentoo flags in a proper way 2015-06-25 15:58:45 +03:00
pengyao
f60c0b3e5b netapi client should create after daemonize 
Otherwise, it will only kill the main process when stop salt-api service
 2015-06-25 17:42:59 +08:00
Peter N
e44c04751b Don't split the string on a single line 
This is to address https://github.com/saltstack/salt/issues/18991
 2015-06-24 20:58:37 -04:00
rallytime
4714d6e0fe Change provider --> driver for gce create function 2015-06-24 16:43:23 -06:00
Joseph Hall
9bf1d526e5 Merge pull request #24931 from rallytime/fix-24912 
Don't stacktrace when provisioning instances for EC2
 2015-06-24 11:49:10 -06:00
Colton Myers
acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/utils/cloud.py
    salt/utils/job.py
 2015-06-24 11:44:04 -06:00
Nicole Thomas
2e76629d15 Merge pull request #24933 from rallytime/versionadded_mod_random 
Change versionadded tag from 2015.5.3 to Beryllium for new mod_random func
 2015-06-24 11:36:27 -06:00
Thomas S Hatch
b2258998a8 Merge pull request #24890 from krak3n/feature/etcd-state-module 
Feature: New etcd salt state module to manage etcd keys
 2015-06-24 11:07:56 -06:00
rallytime
bb880f51e2 Change versionadded tag from 2015.5.3 to Beryllium for new mod_random func 2015-06-24 10:48:42 -06:00
Mike Place
78eb91ce0b Merge pull request #24932 from cachedout/fix_grains_test 
Fix grains test
 2015-06-24 10:47:08 -06:00
Thomas S Hatch
10e17da89d Merge pull request #24709 from garethgreenaway/hipchat_salt_utils_http 
Convert Hipchat to salt.utils.http
 2015-06-24 10:46:40 -06:00
Mike Place
e1069741ea Fix grains test 2015-06-24 10:46:40 -06:00
Thomas S Hatch
2a91f6f06d Merge pull request #24734 from garethgreenaway/config_changes 
Alllow configuration items using either module.key or module:key
 2015-06-24 10:46:09 -06:00
Thomas S Hatch
5a77f8174b Merge pull request #24801 from garethgreenaway/ifttt_module 
Updates to IFTTT module
 2015-06-24 10:45:05 -06:00
Thomas S Hatch
2dc46605c7 Merge pull request #24810 from garethgreenaway/ifttt_state_module 
Adding a state module to trigger events in IFTTT.
 2015-06-24 10:44:43 -06:00
Thomas S Hatch
83da08723b Merge pull request #24815 from twangboy/wua_additional_functionality 
Added additional settings to the wua module
 2015-06-24 10:43:31 -06:00
Thomas S Hatch
4e8ed0d8ed Merge pull request #24873 from jfindlay/rh_service 
convert osrelease grain to str before str op
 2015-06-24 10:43:07 -06:00
Thomas S Hatch
d34c2adf7c Merge pull request #24881 from garethgreenaway/nagios_return_salt_utils_http 
Switching nagios_returner to use salt.utils.http
 2015-06-24 10:42:47 -06:00
Thomas S Hatch
d82af08cd7 Merge pull request #24887 from Unity-Technologies/win-powercfg 
Fixed powercfg on windows 7
 2015-06-24 10:42:18 -06:00
Thomas S Hatch
d3b26fdae1 Merge pull request #24889 from thusoy/patch-2 
Add all iptables jump args from manpage
 2015-06-24 10:41:45 -06:00