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
55,252 Commits 24 Branches 182 Tags 341 MiB
85419a4e15
Commit Graph

55252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Thomas S Hatch
1708d31511 change to get_url 2015-06-25 10:07:16 -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
Thomas Phipps
09ed674491 forgot the unit test. or at least couldn't find it originally. 2015-06-24 17:09:13 -07:00
rallytime
4714d6e0fe Change provider --> driver for gce create function 2015-06-24 16:43:23 -06:00
Thomas Phipps
314ebcc2a7 Revert "neutron doesn't like the input." 
This reverts commit 126b1229e0.
 2015-06-24 12:31:40 -07:00
Thomas Phipps
126b1229e0 neutron doesn't like the input. 2015-06-24 11:39:14 -07: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
Thomas S Hatch
04ca1de166 Merge pull request #24894 from batulin-s/add-functions-to-portage_config 
add functions for detecting changed USE flags
 2015-06-24 10:41:20 -06:00
Thomas S Hatch
dac39b5e82 Merge pull request #24908 from aboe76/mod_random_seed 
Added seed option to mod_random
 2015-06-24 10:40:16 -06:00
Thomas S Hatch
f6c69122fb Merge pull request #24913 from rallytime/required_params_helpers 
Check for required parameters in salt-cloud provider and profile configs
 2015-06-24 10:39:47 -06:00
Thomas S Hatch
d63006773d Merge pull request #24916 from daodennis/patch-1 
broken link, adding /en/latest
 2015-06-24 10:39:17 -06:00
rallytime
3f6e90ec3e Fix salt-cloud stacktrace with provisioning instances for EC2 2015-06-24 10:31:47 -06:00
Chris Reeves
6420db3ae6 Implemented python3 lint error fix, thx @rallytime 2015-06-24 16:53:29 +01:00
Justin Findlay
90819f9c37 Merge pull request #24923 from jayeshka/status-states-unit-test 
adding states/status unit test case.
 2015-06-24 09:50:07 -06:00
sergey.b
46406f5663 add versionadded 2015-06-24 18:23:11 +03:00
Mike Place
6fdad74e29 Merge pull request #24911 from cachedout/issue_24904 
Display total time take by highstate run
 2015-06-24 09:21:09 -06:00
Mike Place
2dd24ece71 Merge pull request #24902 from cro/fixfo2 
Fix minion failover, document same
 2015-06-24 09:20:43 -06:00
Justin Findlay
fc405bc0ee Merge pull request #24917 from daodennis/patch-2 
s/respctively/respectively
 2015-06-24 09:15:41 -06:00
Mike Place
087ee09f46 Merge pull request #24926 from rallytime/bp-22263 
Back-port #22263 to 2015.5
 2015-06-24 09:09:40 -06:00
Justin Findlay
b34a74fe89 Merge pull request #24900 from rallytime/bp-24848 
Back-port #24848 to 2015.5
 2015-06-24 09:09:18 -06:00
Justin Findlay
a546e8e326 Merge pull request #24899 from rallytime/bp-24847 
Back-port #24847 to 2015.5
 2015-06-24 09:09:01 -06:00
Justin Findlay
d4dd8d288d Merge pull request #24898 from rallytime/bp-24845 
Back-port #24845 to 2015.5
 2015-06-24 09:06:09 -06:00