44999 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	96245cf2b2	Merge pull request #19893 from thatch45/mhead_clean ... Clean up an import mistake	2015-01-21 10:22:02 -07:00
Thomas S Hatch	48465a6193	Merge branch 'develop' into mhead_clean ... Conflicts: salt/daemons/flo/zero.py	2015-01-21 10:19:59 -07:00
Nicole Thomas	d244624a1f	Merge pull request #19903 from saltstack/revert-19687-joyent ... Revert "Allow joyent api host suffix to be configurable"	2015-01-21 09:39:57 -07:00
Nicole Thomas	8989c48aa1	Merge pull request #19894 from s0undt3ch/develop ... Lint fixes	2015-01-21 08:12:26 -07:00
Joseph Hall	27adbbe8aa	Revert "Allow joyent api host suffix to be configurable"	2015-01-21 08:05:45 -07:00
Pedro Algarvio	8dbb7394b2	White-space lint fix	2015-01-21 14:17:03 +00:00
Pedro Algarvio	e41f0527ab	Lint fix. Multiple exceptions should be enclosed in parens	2015-01-21 14:15:14 +00:00
Pedro Algarvio	3e7903e1f1	Py3 compatibility	2015-01-21 14:14:00 +00:00
Pedro Algarvio	01de65c702	Strip trailing white-space	2015-01-21 14:11:50 +00:00
Pedro Algarvio	439099922c	White-space lint fix	2015-01-21 14:09:22 +00:00
Pedro Algarvio	7008cd3b47	Use print function, and Salt's fopen	2015-01-21 14:08:30 +00:00
Pedro Algarvio	419483021c	Call super class	2015-01-21 14:05:56 +00:00
Pedro Algarvio	2efb930560	White-space lint fixes	2015-01-21 14:02:05 +00:00
Pedro Algarvio	d5d9228a55	White space lint fixes	2015-01-21 13:48:33 +00:00
Pedro Algarvio	b0920b226e	We still support Python 2.6, so, we need indexes.	2015-01-21 02:11:48 +00:00
Pedro Algarvio	f8563ed807	Lint fixes	2015-01-21 01:08:21 +00:00
Thomas S Hatch	7bb1599e94	Merge pull request #19891 from UtahDave/develop ... better error, including stacktrace	2015-01-20 17:35:36 -07:00
Thomas S Hatch	22606716eb	Merge pull request #19841 from clever-crow-consulting/develop ... BugFix	2015-01-20 17:34:13 -07:00
Thomas S Hatch	e70c72b2e5	Merge pull request #19890 from ryan-lane/revert-19782-boto-secgroup-vpc-return ... Revert "Fixes secgroup return for EC2-VPC"	2015-01-20 17:31:20 -07:00
Thomas S Hatch	54f699f9e3	Clean soem extra blank lines	2015-01-20 17:23:58 -07:00
Thomas S Hatch	55de4b05d0	move the floworker base class into master.py	2015-01-20 17:17:50 -07:00
Thomas S Hatch	2a3079a7f5	fix dependency issue in multi head master ... The FloMworker class should really be moved	2015-01-20 17:10:48 -07:00
David Boucha	201fd4c3e8	better error, including stacktrace	2015-01-20 16:53:28 -07:00
Thomas S Hatch	86db326aa9	Merge pull request #19882 from garethgreenaway/19739_start_time_jobs_active ... Feature addition to jobs runner.	2015-01-20 16:12:54 -07:00
Thomas S Hatch	c8f938a7c8	Merge pull request #19877 from twellspring/patch-4 ... Add how service is determined to be running/dead	2015-01-20 16:10:56 -07:00
Thomas S Hatch	08f5e0cbd0	Merge pull request #19874 from rakai93/iss19871 ... fixes #19871	2015-01-20 16:10:34 -07:00
Thomas S Hatch	a41b20fb9c	Merge pull request #19868 from rupeshta/glance_unit_tests ... implemented unit test cases for glance module	2015-01-20 16:09:34 -07:00
Thomas S Hatch	c49361a1f0	Merge pull request #19863 from jayeshka/djangomod-unit-test ... adding djangomod unit test case	2015-01-20 16:06:35 -07:00
Thomas S Hatch	dca509eb0d	Merge pull request #19859 from twellspring/develop ... Documentation fix for Issue 19513.	2015-01-20 16:06:03 -07:00
Thomas S Hatch	cfb6befae4	Merge pull request #19858 from RyPeck/develop ... Update timeout help to indicate it is in seconds	2015-01-20 16:04:47 -07:00
Thomas S Hatch	97c1757678	Merge pull request #19857 from mirath/state_output_diff_cmdflag ... Added a cmd flag for the state_output_diff variable	2015-01-20 16:04:30 -07:00
Thomas S Hatch	b489dfa8c7	Merge pull request #19855 from colincoghill/develop ... Fix for docker login saltstack/salt#18673	2015-01-20 16:00:20 -07:00
Thomas S Hatch	32f062d8e7	Merge pull request #19851 from rominf/linux_acl_mask ... [linux_acl] add mask support	2015-01-20 15:59:40 -07:00
Ryan Lane	738a0f2121	Revert "Fixes secgroup return for EC2-VPC"	2015-01-20 14:48:08 -08:00
Thomas S Hatch	7ea840fbe1	Merge pull request #19829 from AlexanderHaase/develop ... Fix for issue #17198	2015-01-20 15:43:14 -07:00
Samuel Smith	f2317b0557	Merge pull request #19888 from SmithSamuelM/sam_20150120 ... Added local test runner for salt daemons on raet unittests	2015-01-20 15:16:06 -07:00
Samuel M Smith	7a2ff7f008	added lint exceptions	2015-01-20 15:14:24 -07:00
Samuel M Smith	5fe6b16081	Added local test runner for daemons raet unit tests	2015-01-20 15:06:23 -07:00
Samuel M Smith	b24e32699d	Merge remote-tracking branch 'upstream/develop' into sam_20150120	2015-01-20 14:59:09 -07:00
Samuel Smith	53d003cc3c	Merge pull request #19844 from DSRCompany/raet_presence_test ... Don't run deeds in SetUp, use enter and recur.	2015-01-20 14:58:31 -07:00
Thomas S Hatch	8bfb79c8d9	Merge pull request #19812 from matthew-muscat/develop ... Update hosts file creation for consistency and improved readability	2015-01-20 14:52:01 -07:00
Samuel M Smith	c0fbaa10ff	Merge remote-tracking branch 'upstream/develop' into sam_20150120	2015-01-20 14:45:59 -07:00
Samuel M Smith	0a014dfb2c	fix pedro bug	2015-01-20 14:45:23 -07:00
Thomas S Hatch	6d126d6014	Merge branch '2015.2' into develop	2015-01-20 14:42:47 -07:00
Thomas S Hatch	ef8e457360	Merge pull request #19886 from thatch45/pedro_doh ... @s0undt3ch copy pasta breaks pillar!	2015-01-20 14:41:32 -07:00
Thomas S Hatch	c2be438803	@s0undt3ch copy pasta breaks pillar!	2015-01-20 14:40:20 -07:00
Samuel M Smith	068c5a710c	Merge remote-tracking branch 'upstream/develop' into sam_20150120	2015-01-20 13:58:26 -07:00
Thomas S Hatch	b0d4fa1f5a	Merge pull request #19883 from thatch45/pillar_error ... Add an error to the master log for failed pillar builds	2015-01-20 13:58:01 -07:00
Thomas S Hatch	653aa4686f	Add an error to the master log for failed pillar builds	2015-01-20 13:56:34 -07:00
Gareth J. Greenaway	9da62c4f1b	removing logging statement.	2015-01-20 11:43:54 -08:00