60018 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Delaby	9e56a7e9db	Expose container_id in mine.get_docker ... Because sometimes we should be able to perform additional introspection.	2015-10-02 21:30:33 +02:00
Mike Place	cdac8862ab	Merge pull request #27604 from plastikos/bug-exception_path ... Fix module path to SaltCacheError	2015-10-02 13:29:26 -06:00
Mike Place	151281520f	Merge pull request #27634 from rallytime/linode_private_ips ... Add private IP functionality to the Linode driver	2015-10-02 13:29:01 -06:00
Mike Place	83ae6a1432	Merge pull request #27632 from rallytime/bp-27539 ... Back-port #27539 to 2015.8	2015-10-02 13:28:39 -06:00
Mike Place	e0b3a733c5	Merge pull request #27621 from silenius/grains_dns ... Grains dns	2015-10-02 13:23:02 -06:00
Mike Place	888e9bdf5d	Merge pull request #27633 from rallytime/bp-27559 ... Back-port #27559 to 2015.8	2015-10-02 13:22:07 -06:00
Joseph Hall	8b7da5e469	Merge pull request #27579 from rallytime/fix-27463 ... Change boto_route53 region default to 'universal' to avoid problems with boto library	2015-10-02 12:56:17 -06:00
Stephen Woodrow	2f715803b2	Initial commit of ELB policy management for boto_elb.	2015-10-02 11:38:42 -07:00
rallytime	1d727a545d	Require Network Helper over entire account ... Also fixed calling some functions so they don't stacktrace.	2015-10-02 12:30:19 -06:00
rallytime	a20462b9d9	Allow private ips to be used with the linode driver ... Alos updated the docs to include more provider/profile options and how they're used.	2015-10-02 12:06:05 -06:00
Nicole Thomas	281e4fd966	Merge pull request #27625 from eyj/snapshot-created-fix ... Fix boto_ec2.snapshot_created function race condition	2015-10-02 09:56:53 -06:00
Ethan Moore	3f03815ada	rebasing	2015-10-02 09:53:59 -06:00
rallytime	2b0afd0230	Add versionadded to new path option	2015-10-02 09:51:06 -06:00
Ethan Moore	e54afed73a	moving path kwarg to end of function definition ... added back debug entries that I removed previously	2015-10-02 09:50:24 -06:00
Mike Place	27fcecccbe	Merge pull request #27612 from rallytime/fix-27609 ... Fix GCE external_ip stacktraces in 2015.5	2015-10-02 09:42:20 -06:00
Nicole Thomas	ce4c64a2e3	Merge pull request #27581 from tkwilliams/boto_secgroup_add_vpc_name ... Add support for 'vpc_name' tag in boto_secgroup module and state	2015-10-02 09:40:40 -06:00
Nicole Thomas	2479145025	Merge pull request #27560 from lomeroe/boto_asg_add_remove_lc ... Boto asg add remove lc	2015-10-02 09:39:44 -06:00
Nicole Thomas	d0eebe2a77	Merge pull request #27559 from lomeroe/boto_asg_vpc_fix ... vpc_id fix for boto_vpc.get_subnet_association	2015-10-02 09:39:14 -06:00
Mike Place	fb6f6b9ce4	Merge pull request #27624 from eyj/fix_wait_for_sync ... Wait for sync is not passed to boto_route53 state	2015-10-02 09:37:44 -06:00
Nicole Thomas	5fed31b823	Merge pull request #27548 from lomeroe/add_infoblox ... Add infoblox DNS mgmt	2015-10-02 09:36:38 -06:00
Mike Place	eb59cb8d1c	Merge pull request #27614 from blueyed/doc-minor ... doc: minor fixes to doc and comments	2015-10-02 09:34:02 -06:00
Mike Place	61f8a6f39f	Merge pull request #27627 from eyj/pr-instance-attribute ... Fix crash in boto_asg.get_instances if the requested attribute is None	2015-10-02 09:33:32 -06:00
Nicole Thomas	7020cefb61	Merge pull request #27539 from lomeroe/boto_iam_fixes ... boto_iam updates to function calls that were not passing arguments properly	2015-10-02 09:27:01 -06:00
Julien Cigar	044608977c	fix arg	2015-10-02 17:11:17 +02:00
Julien Cigar	779d8344f7	; may be used as well to comment	2015-10-02 17:06:40 +02:00
EYJ	03d7c6af3d	Fix crash in boto_asg.get_instances if the requested attribute may be None	2015-10-02 15:34:38 +02:00
EYJ	fc87d61011	Fix boto_ec2.snapshot_created function race condition	2015-10-02 15:16:39 +02:00
Nasenbaer	ed6a8c0aa6	Wait for sync is not passed to boto_route53 state	2015-10-02 15:16:31 +02:00
Julien Cigar	d27359c51e	search may appear only once	2015-10-02 15:15:40 +02:00
Julien Cigar	3aeeeb289f	add .. versionadded:: Boron	2015-10-02 13:50:13 +02:00
Ethan Moore	253bd3e9a6	lint fix	2015-10-02 11:01:36 +00:00
Ethan Moore	a596398784	Documentation updates	2015-10-02 10:24:19 +00:00
Ethan Moore	9a883d46d3	syntax fix	2015-10-02 10:11:38 +00:00
Ethan Moore	173c7a690a	rebasing	2015-10-02 10:09:30 +00:00
Julien Cigar	abc90e5293	pylint	2015-10-02 12:01:11 +02:00
Julien Cigar	efee93138c	add proxyminion stuff	2015-10-02 11:37:11 +02:00
Julien Cigar	dd6ec14b5b	fix search list	2015-10-02 11:31:00 +02:00
Julien Cigar	b2bf7b0be3	s/None/''	2015-10-02 11:22:10 +02:00
Julien Cigar	90a2df3f3a	pylint + nameservers	2015-10-02 11:19:09 +02:00
Julien Cigar	80eab6e6b9	initial support for /etc/resolv.conf	2015-10-02 11:14:33 +02:00
jacobhammons	764d70af79	Merge pull request #27616 from jacobhammons/win-repo-docs ... Updated windows software repository docs	2015-10-01 23:04:37 -06:00
Jacob Hammons	1c8b32ce26	Updated windows software repository docs	2015-10-01 22:02:01 -06:00
Tom Williams	159cccf43f	Faulty check logic around optional params	2015-10-01 22:52:36 -04:00
Tom Williams	84ab0bbd74	One last bug to squash. Seriously. It's the last one. Ever! ... - fixed param vpc_id being passed where vpc_name was intended.	2015-10-01 22:12:19 -04:00
Tom Williams	002cbf5cde	Grrr. Add back the import of SaltInvocationError that pylint wanted me to remove :)	2015-10-01 21:48:13 -04:00
Tom Williams	0671c0d8d9	Consolidate some redundant code - thanks @ryan-lane !	2015-10-01 20:57:44 -04:00
Tom Williams	fae1199276	Followed @ryan-lane's suggestion to remove duplicated code from boto_vpc and instead call into that module	2015-10-01 20:11:50 -04:00
Daniel Hahler	98a8c0f055	doc: minor fixes to doc and comments	2015-10-02 01:18:32 +02:00
rallytime	8dc047dc18	If external_up is set to None, don't stacktrace, just use the private ip.	2015-10-01 16:37:17 -06:00
rallytime	2ebf790f9f	[salt-cloud] gce: don't stacktrace if Ephemeral is given instead of ephemeral	2015-10-01 16:00:09 -06:00