35539 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	4f31e86392	Fix exception inside lxc	2014-08-19 14:53:21 -06:00
Nicole Thomas	047a519bb8	Merge pull request #15084 from rallytime/fix_loose_import ... Change LooseVersion import to pass integration.modules.Sysmod tests	2014-08-19 13:45:54 -06:00
rallytime	630c469a40	Change LooseVersion import to pass integration.modules.Sysmod tests	2014-08-19 13:44:11 -06:00
Joseph Hall	10e4db4ddf	Merge pull request #15083 from cachedout/15076 ... Doc fix	2014-08-19 13:27:28 -06:00
Mike Place	8e3b01f17e	Merge pull request #15013 from felskrone/add_tcp_dumper_script ... Add tcp dumper script	2014-08-19 13:26:42 -06:00
Mike Place	05e5ef38b0	Doc fix ... Closes #15076	2014-08-19 13:21:02 -06:00
Nicole Thomas	37420dfed3	Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures ... Boto vpc boto secgroup resolve unit test failures	2014-08-19 13:05:14 -06:00
Colin Johnson	9e797d6664	skip if mock not found	2014-08-19 16:19:41 +00:00
Joseph Hall	a55174afb0	Merge pull request #15075 from hal58th/patch-1 ... Schedule documentation update.	2014-08-19 05:57:16 -06:00
Carl Meyers	7c4ce67d28	Schedule documentation update.	2014-08-18 21:20:54 -07:00
Erik Johnson	5ba675f42b	Merge pull request #15073 from godber/develop ... Added an example for using states.git.latest	2014-08-18 22:12:29 -05:00
Austin Godber	e8e8062616	added example of checking out two branches in the same git repo using the name declaration	2014-08-18 17:28:43 -07:00
Joseph Hall	124519ac57	Merge pull request #15070 from rawkode/bugfix/ec2-bad-identation ... Fixed bad indentation that was causing 'instances_id_list' ...	2014-08-18 18:10:15 -06:00
David McKay	6c1a237383	Fixed bad identation that was causing 'instances_id_list' must be defined when instance_id is used	2014-08-19 00:01:49 +01:00
Colton Myers	360f08dc57	Merge pull request #15068 from techhat/cmdmod ... Template should default to False, not jinja	2014-08-18 15:47:18 -06:00
Joseph Hall	6f42e06b6d	Maybe it should be None, to match the state	2014-08-18 15:46:09 -06:00
Joseph Hall	ad635235a9	Template should default to False, not jinja	2014-08-18 15:40:21 -06:00
Joseph Hall	5fbc3c2232	Merge pull request #15050 from gtmanfred/develop ... add nics capability to salt-cloud nova driver	2014-08-18 14:49:16 -06:00
Joseph Hall	813ff5e473	Merge pull request #15059 from gm3dmo/resolving-issue-15058 ... Resolving issue 15058 Documentation for etcd returner: my_etd_config: sh...	2014-08-18 06:47:49 -06:00
David Morris	71cc33555e	Resolving issue 15058 Documentation for etcd returner: my_etd_config: should read my_etcd_config	2014-08-18 08:44:52 +01:00
Pedro Algarvio	8baf773b78	Merge branch 'develop' of github.com:saltstack/salt into develop	2014-08-18 05:37:27 +01:00
Pedro Algarvio	ea41586ba4	Merge branch '2014.7' into develop	2014-08-18 05:37:12 +01:00
Pedro Algarvio	3644f4f476	Merge pull request #15046 from sylphid8/patch-1 ... correct invalid xmlrpclib auth	2014-08-18 05:36:15 +01:00
Erik Johnson	ebf23ab3cc	Merge pull request #15045 from veidt/develop ... Include dependency required for debconfmod	2014-08-17 18:31:40 -05:00
Joseph Hall	23fbd41a54	Merge pull request #15052 from SaveTheRbtz/cosmetic_fixes ... utils: verify: simplified code	2014-08-17 05:20:57 -06:00
Alexey Ivanov	dbe6d65825	utils: verify: simplified code	2014-08-16 20:34:22 -07:00
Daniel Wallace	696c5b3732	add a note about networks	2014-08-16 18:21:35 -05:00
Joseph Hall	bbf0705f36	Merge pull request #15048 from wackycaptain/fix-doc-contributing ... Fix broken links in contributing documentation.	2014-08-16 17:08:42 -06:00
Joseph Hall	de91040730	Merge pull request #15047 from gtmanfred/clean-salt-host ... Clean salt host	2014-08-16 16:56:49 -06:00
Daniel Wallace	aaacdca41c	add private nics to nova	2014-08-16 16:59:11 -05:00
Daniel Wallace	42be759585	add networks to nova driver	2014-08-16 16:45:36 -05:00
Daniel Wallace	0a5cdbb510	clean last pylint	2014-08-16 16:34:50 -05:00
wackycaptain	1032754af9	Fix broken links in contributing documentation.	2014-08-16 23:27:58 +02:00
Daniel Wallace	4a94768586	if salt_host isn't specified, use ssh_host	2014-08-16 16:10:11 -05:00
Daniel Wallace	298ed19f58	clean up instance variable ... make sure everything is passed to bootstrap or used correctly	2014-08-16 15:46:49 -05:00
Daniel Wallace	1b887c9a9c	clean pylint spacing errors	2014-08-16 15:32:53 -05:00
Daniel Wallace	0e33cc66fa	clean up and namespace salt_interface function	2014-08-16 15:28:23 -05:00
mattmb	7cf627d91d	Make sure we fallback to ssh host if no salt_host	2014-08-16 15:12:51 -05:00
mattmb	27e252445b	Update other clouds with two ssh ip options	2014-08-16 15:12:45 -05:00
mattmb	0c9fd0daaf	Add salt interface config item	2014-08-16 15:12:37 -05:00
sylphid8	a25394d7a3	correct invalid xmlrpclib auth ... Same as #15001, but for pillar this time.	2014-08-16 13:47:40 -05:00
Thomas S Hatch	a485666bf9	Merge pull request #15030 from lyft/botoasg-vpc-fixes ... Return vpc_zone_identifier properly from get_config	2014-08-16 08:48:08 -06:00
veidt	8070697a1c	Include dependency required for debconfmod.	2014-08-16 10:11:27 -04:00
vs	d1599b4780	more linting	2014-08-16 09:24:46 +02:00
vs	bae8d39bb1	lint fixes	2014-08-16 09:01:16 +02:00
Thomas S Hatch	88475ebea3	Merge pull request #15029 from lyft/HOTFIX-botoelb-vpc-fixes ... Fixes for boto_elb for VPC	2014-08-15 23:21:25 -06:00
Thomas S Hatch	02da0dda32	Merge pull request #15016 from whiteinge/netapi-fix-logout ... Add tests and a fix for the rest_cherrypy logout view	2014-08-15 23:20:35 -06:00
Thomas S Hatch	199afaebb6	Merge pull request #15011 from garethgreenaway/schedule_returner_fix ... Fixes to returners.	2014-08-15 23:18:13 -06:00
Thomas S Hatch	e071924b31	Merge pull request #15001 from sylphid8/patch-1 ... correct invalid xmlrpclib auth	2014-08-15 23:14:12 -06:00
Thomas S Hatch	fff64b37ab	Merge pull request #14975 from jhenry82/issue_14304 ... Issue 14304: add proxy parameter to gem.installed state	2014-08-15 23:12:08 -06:00