valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51,776 Commits 24 Branches 182 Tags 341 MiB
0e8ce88311
Commit Graph

51776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Le Marec - Pasquet
0e8ce88311 ubuntu systemd support 2015-04-25 11:52:56 +02:00
Justin Findlay
6efef05d27 Merge pull request #23036 from jfindlay/merge_23017 
adding states/boto_elasticache unit test
 2015-04-24 13:47:27 -06:00
Justin Findlay
cbfcc07840 Merge pull request #23037 from jfindlay/merge_23018 
adding states/boto_elb unit test
 2015-04-24 13:47:18 -06:00
Jayesh Kariya
06979ca744 adding states/boto_elb unit test 2015-04-24 12:07:41 -06:00
Jayesh Kariya
eda40c4b33 adding states/boto_elasticache unit test 2015-04-24 12:05:24 -06:00
Justin Findlay
a74ae78efe Merge pull request #23030 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-24 11:23:27 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
 2015-04-24 10:19:03 -06:00
Justin Findlay
d5a4173478 Merge pull request #23024 from The-Loeki/patch-1 
minion nodes should parse minion configs
 2015-04-24 09:34:17 -06:00
Ronald van Zantvoort
96af032908 minion nodes should parse minion configs 
Small copy/paste typo there
 2015-04-24 16:55:19 +02:00
Justin Findlay
f9bdf6347d Merge pull request #23019 from jayeshka/boto_iam_role-states-unit-test 
adding states/boto_iam_role unit test case
 2015-04-24 08:42:51 -06:00
Justin Findlay
588579b124 Merge pull request #23020 from jayeshka/raet_publish-unit-test 
adding raet_publish unit test case
 2015-04-24 08:42:20 -06:00
Justin Findlay
24d2c6f501 Merge pull request #23011 from plastikos/improvement-leading_not 
Add a versionadded note for the leading "not"
 2015-04-24 08:11:34 -06:00
Jayesh Kariya
49894795ad adding raet_publish unit test case 2015-04-24 17:30:24 +05:30
Jayesh Kariya
93214d0441 adding states/boto_iam_role unit test case 2015-04-24 17:21:28 +05:30
Thayne Harbaugh
bbd063fdee Add a versionadded note for the leading "not" 2015-04-23 22:27:10 -06:00
Thomas S Hatch
4d57a2d7c0 Merge pull request #22962 from cachedout/remove_gitpillar_update 
Remove update() in git pillar
 2015-04-23 21:45:54 -06:00
Thomas S Hatch
9a1a55850a Merge pull request #22963 from garethgreenaway/verify_schedule_functions_with_events 
Additions to schedule module
 2015-04-23 21:45:25 -06:00
Thomas S Hatch
de24ecfc90 Merge pull request #22966 from techhat/stormpathup 
Updates to Stormpath as per @rdegges
 2015-04-23 21:44:58 -06:00
Thomas S Hatch
57999117f2 Merge pull request #22969 from plastikos/improvement-leading_not 
Allow compound expressions to begin with "not"
 2015-04-23 21:44:45 -06:00
Thomas S Hatch
e33e3c130e Merge pull request #22998 from techhat/restsdb 
Add REST driver for SDB
 2015-04-23 21:43:15 -06:00
Thomas S Hatch
d13058685c Merge pull request #23005 from clinta/x509 
X509
 2015-04-23 21:41:12 -06:00
Justin Findlay
80621eb9ce Merge pull request #23002 from rallytime/remove_requests_dep 
Remove python-requests dependency from debian/control
 2015-04-23 21:29:47 -06:00
Justin Findlay
336373c4f1 Merge pull request #23003 from notpeter/develop 
Typo in ssh.check_key_file doc example
 2015-04-23 21:16:34 -06:00
Clint Armstrong
802fe537f0 Merge branch 'develop' into x509 2015-04-23 20:31:11 -04:00
Peter Tripp
3a36824fdb Typo in ssh.check_key_file example. 2015-04-23 16:46:53 -07:00
rallytime
cc3999e006 Remove python-requests dependency from debian/control 2015-04-23 17:04:17 -06:00
Nicole Thomas
1d9230cb8f Merge pull request #22952 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-23 15:56:44 -06:00
Joseph Hall
a6d2b3d51a Lint 2015-04-23 15:27:16 -06:00
Joseph Hall
e5a186e863 Fixing etcd reference 2015-04-23 14:41:04 -06:00
Joseph Hall
60378b4d3d Add REST driver for SDB 2015-04-23 14:40:05 -06:00
Colton Myers
ed6eadceff Merge pull request #22995 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-23 14:10:19 -06:00
Colton Myers
8de3dceeec Revert "Initialize state file client after pillar loading" 
This reverts commit 31b98e72eb.
 2015-04-23 14:09:22 -06:00
Colton Myers
035ad549d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/schedule.py
    salt/utils/schedule.py
 2015-04-23 13:00:35 -06:00
Nicole Thomas
1445f58193 Merge pull request #22992 from plastikos/bug-test_startup_timeout 
[bug] Update time so that minion startup can timeout.
 2015-04-23 12:16:52 -06:00
Thayne Harbaugh
f155daf700 Update time so that minion startup can timeout. 2015-04-23 10:55:42 -06:00
Thomas S Hatch
6391053926 Merge pull request #22972 from whiteinge/scheduler-once 
Added 'once' support to the scheduler
 2015-04-23 10:26:55 -06:00
Thomas S Hatch
59d0626928 Merge pull request #22975 from whiteinge/salt-api-misc 
Add a new html tool to rest_cherrypy; fix oversight from #22970
 2015-04-23 10:26:09 -06:00
Justin Findlay
fc7ec24cb3 Merge pull request #22986 from hnsk/develop 
Added option keyalgorithm for DDNS updates
 2015-04-23 10:12:49 -06:00
Nicole Thomas
cf9041744a Merge pull request #22985 from jfindlay/apache_state_test 
fix failing apache state unit test
 2015-04-23 09:18:23 -06:00
Justin Findlay
340dba3210 Merge pull request #22982 from jayeshka/qemu_img-unit-test 
adding qemu_img unit test case
 2015-04-23 08:18:46 -06:00
Justin Findlay
10fa7eea14 Merge pull request #22980 from jayeshka/boto_elb-states-unit-test 
Boto elb states unit test
 2015-04-23 08:16:44 -06:00
Justin Findlay
c50bf4ec50 Merge pull request #22979 from jayeshka/boto_elasticache-states-unit-test 
Boto elasticache states unit test
 2015-04-23 08:15:40 -06:00
Justin Findlay
34453b314e fix failing apache state unit test 2015-04-23 08:09:15 -06:00
Hannu Ylitalo
74405f1d2a Added option keyalgorithm for DDNS updates (defaults to: 
HMAC-MD5.SIG-ALG.REG.INT).
 2015-04-23 17:05:10 +03:00
Jayesh Kariya
b9188aea6a adding qemu_img unit test case 2015-04-23 18:13:27 +05:30
Jayesh Kariya
d347bb4e3b changes as per 2015.2 branch 2015-04-23 17:58:08 +05:30
Jayesh Kariya
06bf61822d changes as per 2015.2 branch 2015-04-23 17:56:04 +05:30
Justin Findlay
f2eb8c509a Merge pull request #22978 from makinacorpus/file 
Fix file.managed absent source error
 2015-04-23 06:19:26 -06:00
Jayesh Kariya
6ef51d1b2d adding states/boto_elb unit test case 2015-04-23 17:29:19 +05:30
Jayesh Kariya
2c03692d04 adding states/boto_elasticache unit test case 2015-04-23 17:27:28 +05:30