jfindlay
4234a76d0e
Merge pull request #19817 from jfindlay/cassandra_unit_tests
...
fix cassandra unit tests
2015-01-17 15:10:25 -07:00
Justin Findlay
9d18f7a879
fix cassandra unit tests
2015-01-17 14:02:38 -07:00
Justin Findlay
843b71965c
column_family_definition requires keyspace, column_family args
2015-01-17 14:00:44 -07:00
Thomas S Hatch
5c2ce4c0bb
Merge pull request #19790 from cachedout/mm_event
...
Fix multi-master event handling bug
2015-01-17 09:45:47 -07:00
Thomas S Hatch
1569520a4b
Merge pull request #19792 from rallytime/merge_forward_develop
...
Merge 2015.2 forward into develop
2015-01-17 09:39:02 -07:00
Thomas S Hatch
ee18559023
Merge pull request #19793 from cachedout/service_wait
...
Provide an option to service.running to wait for a service to fully init
2015-01-16 17:06:11 -07:00
Thomas S Hatch
3edd84a244
Merge pull request #19783 from jayeshka/deb_apache-unit-test
...
adding deb_apache unit test
2015-01-16 17:02:07 -07:00
Thomas S Hatch
7f4a2c75e0
Merge pull request #19782 from claudiupopescu/boto-secgroup-vpc-return
...
Fixes secgroup return for EC2-VPC
2015-01-16 17:01:44 -07:00
Thomas S Hatch
391cf6bd83
Merge pull request #19778 from thatch45/zmq_ioflo
...
Multi Headed Master
2015-01-16 17:00:01 -07:00
Thomas S Hatch
602517e5fd
Merge pull request #19774 from DSRCompany/raet_presence_test
...
Presenter test using FrameIofloTestCase
2015-01-16 16:59:32 -07:00
Thomas S Hatch
c3b4dd57aa
Merge pull request #19768 from lyft/grafana-module
...
Initial grafana state and elasticache execution modules
2015-01-16 16:59:09 -07:00
Thomas S Hatch
fab600add9
Merge pull request #19746 from lyft/add-boto-sns-module
...
Add boto_sns module and state.
2015-01-16 16:58:09 -07:00
Thomas S Hatch
d95ec638ef
Merge pull request #19808 from jfindlay/mount_unit_tests
...
Mount unit tests
2015-01-16 16:57:12 -07:00
Joseph Hall
1d2279a775
Merge pull request #19806 from hulu/typos
...
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 16:36:58 -07:00
Joseph Hall
2c649bee65
Merge pull request #19810 from ezheidtmann/patch-1
...
Remove XMPP from docs for salt.states.smtp
2015-01-16 16:35:11 -07:00
Evan Heidtmann
c9f1e22c70
Remove XMPP from docs for salt.states.smtp
...
Pretty sure this module doesn't use XMPP -- a typo from another module?
2015-01-16 15:16:13 -08:00
Justin Findlay
bcdab12b75
fix mount module unit tests
...
I currently don't have access to an OpenBSD system, so I don't know what
the 6 columns of output of `swapctl -kl` is since some of the outputted
columns are discarded by the mount module, but as they are discarded,
they do not affect the tests of mount.swaps.
2015-01-16 15:40:39 -07:00
Chris Rebert
19e262bb7b
Fix typos with the help of https://github.com/vlajos/misspell_fixer
2015-01-16 13:35:47 -08:00
Joseph Hall
8b5b50a673
Merge pull request #19803 from twellspring/cloud_timeouts_fix
...
cloud timeout doc updates
2015-01-16 14:08:04 -07:00
Todd Wells
99114eeeeb
cloud timeout doc updates
2015-01-16 12:37:28 -08: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
Mathias Gug
2ef1b40af1
Document remaining module functions.
2015-01-16 09:17:37 -08:00
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
