Thayne Harbaugh
6f4cfd01fc
Specify compound matches as lists
...
Compound matches, such as nodegroups, can now be specified as lists. This
avoids splitting on whitespace which may be part of a key or value.
Right now this only works for nodegroups. Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Thayne Harbaugh
4adcf1c6f9
Correct referencing delimiter
2015-04-24 13:18:33 -06:00
Thayne Harbaugh
5abd3a7fb8
Correct undefined variable.
2015-04-24 11:02:51 -06:00
Thayne Harbaugh
993373655a
Allow grain and pillar delimiter to be specified in compound matcher syntax.
2015-04-23 23:26:49 -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
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
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
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
Mathieu Le Marec - Pasquet
73178d7a61
Fix file.managed absent source error
2015-04-23 11:43:13 +02:00
Seth House
eceacad9c4
Added favicon support to avoid 404s
2015-04-23 02:12:12 -06:00
Seth House
de976756d5
Switch is_master_running() to be a private method
...
The list of available clients is generated from the public methods on
the class.
2015-04-23 02:00:51 -06:00
Seth House
b24cbc68d5
Added rest_cherrypy tool to serve HTML the root URL
2015-04-23 01:58:33 -06:00
Justin Findlay
36956413e5
Merge pull request #22971 from scottp-dpaw/develop
...
Allow PPAs on Linux Mint
2015-04-22 23:12:19 -06:00
Justin Findlay
7fdfa4c3fd
Merge pull request #22970 from whiteinge/salt-api-503-support
...
Add support to salt-api to detect a downed master and return 503s
2015-04-22 23:10:22 -06:00
Gareth J. Greenaway
503bd89b59
lint
2015-04-22 22:02:49 -07:00
Justin Findlay
b0e59b22bf
Merge pull request #22967 from jfindlay/merge_22937
...
adding states/boto_ec2 unit test case
2015-04-22 23:02:49 -06:00
Gareth J. Greenaway
58bce28f14
fixing various things that caused unit tests to fail. updating unit tests based on code changes
2015-04-22 21:30:58 -07:00
Seth House
4328b1839d
Added 'once' support to the scheduler
2015-04-22 21:56:41 -06:00
Seth House
e83f73d3e8
Return a 503 when the Salt master is down; for commands and auths
2015-04-22 21:53:37 -06:00
Seth House
036c14cc59
Check if the Salt Master is running before trying to run a command
2015-04-22 21:53:36 -06:00
Seth House
deaa323acd
Add new exception subclass for when a required daemon is not running
2015-04-22 21:53:35 -06:00
Seth House
a1de4a137c
Add a method to NetapiClient to check if the master is running
2015-04-22 21:53:35 -06:00
Scott Percival
a98c4bfc2a
Allow PPAs on Linux Mint
2015-04-23 11:10:12 +08:00
