31192 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	0e53190996	Fix broken tests ... Thanks to @rallytime for pointing out that several unit tests were not working correctly when run locally. I have fixed the perm_test to no longer use relative paths. I have also disabled this tests since, at some point at least, perms changed to be 0664 instead of 0644 in a number of places. This warrents further discussion. I have fixed pydsl_test to no longer throw errors to stdout about missing SLS files. (Yay!!) I have fixed the smtp_return tests so that it will without errors on hosts with gnupg installed.	2014-05-29 15:04:11 -06:00
Joseph Hall	968603463b	Merge pull request #13120 from garethgreenaway/iptables_fix ... Fix to iptables module	2014-05-29 13:37:24 -06:00
Gareth J. Greenaway	083bfc6fa7	fix to __virtual__ function in iptables module. __salt__ is unavailable so was throwing an error when the minion started up.	2014-05-29 12:06:33 -07:00
Joseph Hall	e060c74c46	Merge pull request #13119 from rallysf/develop ... Insert missing safety check	2014-05-29 12:54:28 -06:00
Michael Gregson	750f1b5bdc	Insert missing safety check ... Without this check allocate_new_eip becomes required on every ENI allocation, which is frustrating and breaks this for no reason.	2014-05-29 11:22:29 -07:00
Colton Myers	ecce85dcff	Merge pull request #13116 from cachedout/12396 ... Fix error in cache detection time	2014-05-29 10:30:37 -06:00
Thomas S Hatch	a71c07b3bc	Merge pull request #13114 from garethgreenaway/strings_for_global_onlyif_and_unless ... Update to state.py	2014-05-29 10:02:55 -06:00
Thomas S Hatch	39929f9039	Merge pull request #13109 from jcsp/saltutil-running-enoent ... saltutil: handle IOError in running()	2014-05-29 10:00:44 -06:00
Mike Place	7507a3764a	Fix error in cache detection time ... Master job caches were not being cleaned because we were incorrectly detecting the age of the cache file. To wit: [DEBUG ] Cache cleaner evaluating jid file at time 2014-05-23 11:53:00 [DEBUG ] Cache cleaner thinks that the current time is: 2014-05-29 09:23:38.740181 [DEBUG ] Cache cleaner sees the difference as: 5 days, 21:30:38.740181 [DEBUG ] Cache cleaner sees the HOURS difference as: 21.5105555556 [DEBUG ] Cache cleaner is set to only clean jobs after 24 hours Closes 12396	2014-05-29 09:58:36 -06:00
Thomas S Hatch	f078a403a7	Merge pull request #13096 from jessecollier/svn_export_overwrite ... Adding overwrite flag to svn.export state fix for #13092	2014-05-29 09:54:32 -06:00
Thomas S Hatch	4bd8035818	File encoding	2014-05-29 09:53:19 -06:00
Thomas S Hatch	9a5797c9fc	Merge pull request #13095 from lyft/boto-elasticache ... Initial commit of boto_elasticache execution module and state	2014-05-29 09:52:28 -06:00
Thomas S Hatch	8bd09f49bc	Merge pull request #13090 from thematthopkins/windows_registry_key_fix ... fix for incorrect string split character in windows registry keys	2014-05-29 09:48:18 -06:00
Thomas S Hatch	3621f85e62	Merge pull request #13087 from Stelminator/minion_dry4 ... DRY Syndic socket options	2014-05-29 09:47:05 -06:00
Gareth J. Greenaway	1e14e61f43	Update to the global unless and onlyif code to allow specifying them in the state files as strings in addition to lists.	2014-05-29 08:08:31 -07:00
Mike Place	6dcb1839a7	Merge pull request #13113 from rallytime/test_docs ... Minor changes to integration test docs	2014-05-29 08:59:29 -06:00
rallytime	153e71c76b	Minor changes to integration test docs	2014-05-29 08:56:58 -06:00
Matthew Hopkins	c84a2ccacd	Merge branch 'develop' into windows_registry_key_fix	2014-05-29 10:25:23 -04:00
Erik Johnson	5069168381	Merge pull request #13098 from s0undt3ch/develop ... Remove remaining `exsel` code	2014-05-29 08:51:10 -05:00
John Spray	0e9728241f	saltutil: handle IOError in running() ... The running() function was unreliable, because it would fail on IOErrors reading proc files. Those are actually really common because the proc files are being created and destroyed in the background while jobs run. This made kill_job unreliable too, because it relies on running() to find its victim.	2014-05-29 12:08:04 +01:00
Joseph Hall	14d54df7ac	Merge pull request #13106 from fsniper/develop ... Added exception message to module.run states comment in case of an exception	2014-05-29 04:11:26 -06:00
Onur Yalazi	e431fccaed	Added exception message to module.run states comment in case of an exception	2014-05-29 12:04:09 +03:00
Joseph Hall	a6ecec5143	Merge pull request #13100 from s0undt3ch/hotfix/transifex-updates ... Update 'doc/.tx/config' - Build #66	2014-05-29 02:18:38 -06:00
Pedro Algarvio	83dded24c6	Merge pull request #13105 from techhat/exists ... This is deceptive if the machine exists, but is STOPPED	2014-05-29 09:10:45 +01:00
Joseph Hall	93c7518d94	This is deceptive if the machine exists, but is STOPPED	2014-05-29 01:54:07 -06:00
Joseph Hall	b74b367791	Merge pull request #13093 from gtmanfred/develop ... remove _has_check and just check iptables --help	2014-05-29 00:46:55 -06:00
Joseph Hall	e9ac938b73	Merge pull request #13101 from grischa/nova-cloud-fixes ... some fixes for the nova cloud adapter	2014-05-29 00:43:47 -06:00
David Boucha	c6ac8343ad	Merge pull request #13086 from thematthopkins/windows_SecurityDescriptorLess_filesystems ... Fix for Windows filesystems without a SECURITY_DESCRIPTOR	2014-05-29 04:23:18 +00:00
Grischa Meyer	9e68c86118	some fixes for the nova cloud adapter	2014-05-29 01:53:46 +00:00
Matthew Hopkins	da6058e0a2	removes trailing whitespace per pylint feedback	2014-05-28 21:21:36 -04:00
Pedro Algarvio	35599ab277	Update 'doc/.tx/config' - Build #66 ... http://cookingwithsalt.org/job/salt/job/transifex/66/ Signed-off-by: Pedro Algarvio <pedro@algarvio.me>	2014-05-29 01:42:01 +01:00
Pedro Algarvio	7bd8b1360f	Remove remaining exsel code	2014-05-29 01:32:54 +01:00
Daniel Wallace	9df10361fc	fix pylint	2014-05-28 18:35:43 -05:00
Jesse Collier	50be2551c0	Adding overwrite flag to svn.export state	2014-05-28 16:01:16 -07:00
Ryan Lane	ad66e17c5a	Initial commit of the boto_elasticache state module.	2014-05-28 15:46:26 -07:00
Daniel Wallace	3d9244fc8e	remove _has_check and just check iptables --help	2014-05-28 17:29:39 -05:00
Ryan Lane	807b7d29a9	Followup changes for boto_elasticache execution module	2014-05-28 15:15:47 -07:00
Matthew Hopkins	6699647389	fix for incorrect string split character in windows registry keys	2014-05-28 17:10:09 -04:00
Matthew Hopkins	8d73f4528e	removes unused exception variable	2014-05-28 16:53:32 -04:00
Christopher A. Stelma	ba119fdabe	DRY Syndic socket options	2014-05-28 13:46:40 -07:00
Matthew Hopkins	ec591d61b6	Assumes Everyone is the SID, in the case that the filesystem has no SecurityDescriptor	2014-05-28 16:41:57 -04:00
David Boucha	ab986e7aef	Merge pull request #13084 from nicolehubbard/docker-private-port ... Include the private port in the get_docker mine	2014-05-28 20:17:42 +00:00
Thomas S Hatch	f06e4de247	Merge pull request #13083 from rallytime/test_docs ... More testing documentation improvements	2014-05-28 13:41:36 -06:00
Thomas S Hatch	2dca3294c0	Merge pull request #13082 from ticosax/develop ... this **kw was intended for installed() not for remove_container()	2014-05-28 13:41:00 -06:00
Nicole Renee Hubbard	49ee9a5b8f	Include the private port in mine.get_docker	2014-05-28 14:30:03 -05:00
rallytime	24d41b0212	More testing documentation improvements	2014-05-28 13:29:20 -06:00
Nicolas Delaby	eea26038e1	this **kw was intended for installed() not for remove_container()	2014-05-28 21:17:15 +02:00
Thomas S Hatch	095bbcecbf	Merge pull request #13076 from basepi/npm13026 ... Ignore retcode for npm.list	2014-05-28 13:09:29 -06:00
Thomas S Hatch	b026c6acae	Lint per #12980	2014-05-28 10:27:24 -06:00
Colton Myers	1d297b2e21	Ignore retcode for npm.list	2014-05-28 10:27:17 -06:00