valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,916 Commits 24 Branches 182 Tags 341 MiB
923e062ef1
Commit Graph

44916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel M Smith
923e062ef1 Fixed problems when aes not setup on conventional minion not one meant for multi-headed 2015-01-20 11:47:53 -07:00
Samuel M Smith
0c65488456 Merge remote-tracking branch 'upstream/develop' into sam_20150120 2015-01-20 11:14:56 -07:00
Samuel M Smith
6b81e2a38f Fixed reference. Someone moved where the Minion daemon class was defined 2015-01-20 11:12:00 -07:00
Thomas S Hatch
89ef86096c Merge pull request #19814 from thatch45/mkey_cli 
Mkey cli
 2015-01-20 10:22:09 -07:00
Joseph Hall
5f00166315 Merge pull request #19831 from TronPaul/iptables_bang_not_fix 
Fix iptables regex issue
 2015-01-18 07:51:21 -07:00
Mark McGuire
4910822280 fix regex issue 2015-01-18 00:11:35 -06:00
jfindlay
8133907a62 Merge pull request #19786 from jayeshka/defaults-unit-test 
Adding defaults unit test case
 2015-01-17 20:35:37 -07:00
jfindlay
d04dee8443 Merge pull request #19685 from rupeshta/ddns_unit_tests 
test ddns module
 2015-01-17 20:34:27 -07:00
jfindlay
d7d15e3a60 Merge pull request #19821 from jfindlay/debian_service_unit_tests 
fix debian service unit tests
 2015-01-17 17:47:18 -07:00
jfindlay
8ea53a73eb Merge pull request #19822 from jfindlay/dnsmasq_unit_test 
fix dnsmasq unit tests
 2015-01-17 17:44:47 -07:00
Justin Findlay
9202cbba78 fix dnsmasq unit tests 2015-01-17 15:44:45 -07:00
jfindlay
b42029b3c6 Merge pull request #19819 from jfindlay/environ_unit_tests 
fix environ unit tests
 2015-01-17 15:42:21 -07:00
Justin Findlay
555dbd66ab fix debian_service unit tests 2015-01-17 15:31:52 -07:00
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
770258e511 fix environ module unit tests 2015-01-17 15:07: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
b993e0a07b Add hidden multikey to opts for salt multikey 2015-01-17 11:00:20 -07:00
Thomas S Hatch
688a2a133a Add indentation to the key outputter for multi key 2015-01-17 10:58:13 -07:00
Thomas S Hatch
8a180d39a0 make the outputs consistent 2015-01-17 10:46:51 -07:00
Thomas S Hatch
adc6348d28 multikey works, still needs some tuning... 2015-01-17 10:02:11 -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
Thomas S Hatch
fd98239ad1 Make a cli system for the multi key interface 2015-01-16 14:03:30 -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
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