Thomas S Hatch
5fb9e913fc
Merge pull request #19798 from jfindlay/fix_msiexec
...
fix msiexec cmd, #19796
2015-01-16 13:34:53 -07:00
Colton Myers
55492cc283
Use salt.utils.args for salt-ssh arg parsing
2015-01-16 13:31:51 -07:00
Colton Myers
18a75e2055
Remove the extra, unused cmd function
2015-01-16 13:30:34 -07:00
Justin Findlay
136386d557
fix msiexec cmd, #19796
2015-01-16 13:22:21 -07:00
Mike Place
9f4d5dc8c9
Provide an option to service.running to wait for a service to fully init
...
Closes #19084
2015-01-16 11:46:46 -07:00
rallytime
d724ed3a47
Merge branch '2015.2' into 'develop'
...
Conflicts:
salt/cli/batch.py
salt/cloud/clouds/msazure.py
tests/integration/netapi/rest_tornado/test_app.py
2015-01-16 11:36:32 -07:00
Mathias Gug
effc9488f5
Merge branch 'develop' of github.com:saltstack/salt into add-boto-sns-module
2015-01-16 10:02:52 -08:00
Mike Place
86e4ccf76e
Remove unnecessary comment
2015-01-16 10:40:23 -07:00
Mike Place
ad02d09821
Fix multi-master event handling bug
...
We had a situation wherein minion generators would race to the sub
socket and only a single minion would actually act on the package. The
result was that events such as refresh_pillar would cause one (or
sometimes both) minions to stop responding. This changes the behaviour
so that the first instance to get the request calls action on all
instances.
While this has the possible side-effect of blocking for O(n) inside the event
handling loop, it also ensures that multi-master minions update in a
linear fashion.
2015-01-16 10:33:53 -07:00
Mathias Gug
057d4cd15b
Add documentation.
...
Fix style.
2015-01-16 09:27:05 -08:00
Justin Findlay
2506d3491e
end /etc/hosts with EOL to not break utils that read it
...
fixes #19738
2015-01-16 10:19:26 -07:00
Mathias Gug
2ef1b40af1
Document remaining module functions.
2015-01-16 09:17:37 -08:00
Jayesh Kariya
bb6e22999e
Adding defaults unit test case
2015-01-16 19:12:19 +05:30
Jayesh Kariya
f245aec8a9
resolved pylint error
2015-01-16 17:39:32 +05:30
Jayesh Kariya
ede0a375df
adding deb_apache unit test
2015-01-16 15:00:52 +05:30
Claudiu Popescu
a835135276
Fixes secgroup return for EC2-VPC
2015-01-16 09:09:32 +01:00
rallytime
2c57d8ba6a
Merge branch '2014.7' into 2015.2
2015-01-16 00:30:41 -07:00
Nicole Thomas
0b9d02d292
Merge pull request #19781 from rallytime/pylint_dance
...
Pylint fix for 2014.7
2015-01-16 00:24:19 -07:00
Nicole Thomas
0b3c3f84c8
Merge pull request #19780 from rupeshta/event_unit_tests
...
test event tests
2015-01-16 00:23:44 -07:00
Nicole Thomas
afc4433d07
Merge pull request #19771 from basepi/merge-forward-2015.2
...
Merge forward 2014.7 to 2015.2
2015-01-16 00:10:55 -07:00
rallytime
6ca91176da
Pylint fix for 2014.7
2015-01-16 00:09:34 -07:00
Nicole Thomas
e472b25e23
Merge pull request #19779 from rupeshta/gnomedesktop_unit_tests
...
test gnomedesktop tests
2015-01-16 00:05:04 -07:00
Rupesh Tare
74015f974e
test event tests
2015-01-16 11:38:29 +05:30
Dmitry Kuzmenko
79daaa5e3e
.flo script based presence test
2015-01-16 09:05:51 +03:00
Rupesh Tare
64b29032af
test gnomedesktop tests
2015-01-16 11:20:17 +05:30
Thomas S Hatch
5678558e1d
Merge pull request #19777 from garethgreenaway/fix_schedule_list
...
fixes to schedule module in 2014.7
2015-01-15 21:58:19 -07:00
Thomas S Hatch
96c84e697b
Merge branch 'develop' into zmq_ioflo
...
Conflicts:
salt/config.py
2015-01-15 21:49:01 -07:00
Thomas S Hatch
61d0ad9492
zmq publish works now!
2015-01-15 21:45:56 -07:00
Gareth J. Greenaway
08c9bc9c12
fixing a bug where schedule.list would error out if it encountered a configuration item that wasn't in the list of supported items.
2015-01-15 20:09:28 -08:00
Thomas S Hatch
4e6fad26b0
Add the zmq pub packet setup routines
2015-01-15 20:41:01 -07:00
Thomas S Hatch
a5196144e7
Add metadata etc to raet publish
2015-01-15 20:30:18 -07:00
Ryan Lane
a1421e6dff
CLI examples and docstrings
2015-01-15 16:54:52 -08:00
Thomas S Hatch
cf0709ff5d
Merge pull request #19770 from terminalmage/lint
...
Fix incorrect variable name
2015-01-15 17:43:51 -07:00
Dmitry Kuzmenko
637a5aa719
Presenter test using FrameIofloTestCase
2015-01-16 03:39:56 +03:00
Erik Johnson
769ebe7a98
Fix lint failure
2015-01-15 17:38:51 -06:00
Ryan Lane
0c000cc500
Fix lint error
2015-01-15 15:36:09 -08:00
Colton Myers
d1b201e2bf
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/runners/manage.py
salt/utils/cloud.py
2015-01-15 16:20:48 -07:00
Erik Johnson
6216d17e5a
Fix incorrect variable name
2015-01-15 16:59:02 -06:00
Thomas S Hatch
d3fc81ebcb
Merge pull request #19742 from basepi/saltssh.msgpack.remove.7913
...
[DO NOT MERGE] Remove msgpack from thin generation for salt-ssh
2015-01-15 15:41:59 -07:00
Thomas S Hatch
41d0c1a8cd
Merge pull request #19759 from garethgreenaway/schedule_until_feature
...
Additions to scheduler.
2015-01-15 15:41:30 -07:00
Thomas S Hatch
ce2e4027d5
Merge pull request #19758 from techhat/showservice
...
Add show_service() function to msazure
2015-01-15 15:41:01 -07:00
Thomas S Hatch
1200db5325
Merge pull request #19745 from techhat/urllib2-2015.2
...
Default http.query() to urllib2, but still allow requests
2015-01-15 15:40:26 -07:00
Joseph Hall
56a52f9552
Merge pull request #19752 from rallytime/remove_sshpass_checks
...
Remove sshpass checks
2015-01-15 15:12:00 -07:00
Mike Place
afb7faaaf1
Merge pull request #19765 from terminalmage/fix-render-logging
...
Fix spurious log message
2015-01-15 14:08:48 -07:00
Erik Johnson
7177fd313c
Fix spurious log message
...
c65af6a8c65af6a8
2015-01-15 13:10:12 -06:00
Gareth J. Greenaway
eb8b6c7d77
Typo in documentation
2015-01-15 10:58:28 -08:00
Mike Place
e93be2be61
Merge pull request #19762 from cachedout/fix_event_test
...
Fix broken test
2015-01-15 10:49:14 -07:00
Mike Place
bb3c1714f8
Style fixes
2015-01-15 10:48:44 -07:00
Mike Place
6d14d4e661
Fix broken test
2015-01-15 10:41:08 -07:00
Thomas S Hatch
2fd489d5bf
Merge pull request #19750 from techhat/xmark
...
Move --set-xmark after iptables jump
2015-01-15 10:13:27 -07:00
