Colton Myers
f8b8441485
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-11-12 11:01:07 -07:00
Thomas Jackson
f49502fd48
__modules__ isn't a global, although __salt__ is
...
This method is attempting to access the loader so that it can get an error message. The module loader is `__salt__` not `__modules__`. This before was throwing an exception in __virtual__ if dockerng.version wasn't in the modules. Pylint was also complaining about this, so I've remove the pylint override that was placed here as well.
2015-11-12 09:55:44 -08:00
Thomas Jackson
c734cb8876
Fix virtual_timer branch such that it will catch exceptions.
...
We got into some weird error conditions. In the reported issue if the module threw an exception in __virtual__ it was logged as returning None, instead of throwing an exception and logging so.
Fix for #28549
2015-11-12 09:55:43 -08:00
Mike Place
93562631aa
Merge pull request #28756 from MrCitron/fix-25775
...
Fix #25775
2015-11-12 10:47:50 -07:00
Colton Myers
1e1a74fd61
Add backports_abc and singledispatch_helpers to thin as well
2015-11-12 10:28:35 -07:00
rallytime
ab5943995b
Change versionaddeds to 2015.8.2 from Boron
2015-11-12 10:05:44 -07:00
C. R. Oldham
da7ad0df99
Add versionadded directives.
2015-11-12 10:04:17 -07:00
Todd Tomkinson
4bdd10fdf5
documentation updates
2015-11-12 10:03:56 -07:00
Todd Tomkinson
675bc2acce
more pylint fixes
2015-11-12 10:03:51 -07:00
Todd Tomkinson
8e19b5c518
pylint fixes
2015-11-12 10:03:43 -07:00
Todd Tomkinson
ba94878f45
marathon and chronos proxy minions
2015-11-12 10:03:38 -07:00
Mike Place
f799971280
Change logic
2015-11-12 09:17:42 -07:00
Bo Maryniuk
2d43199d20
Preserve 'first found first win' ordering
2015-11-12 10:50:26 +01:00
Bo Maryniuk
1c59eedec2
Enhance 'which' decorator reliability for peculiar environments
2015-11-12 10:34:36 +01:00
Mike Place
30ea94439c
Merge pull request #28803 from jfindlay/sdecodes
...
decode strings to utf-8
2015-11-11 21:59:38 -07:00
Nicole Thomas
59b505ff7c
Merge pull request #28782 from rallytime/rabbitmq-user-state
...
Fixes to rabbitmq user state
2015-11-11 17:59:57 -07:00
Mike Place
52ed06500a
Fix typo
2015-11-11 16:28:40 -07:00
Mike Place
9b18f372e6
Normalize IPC check among transports
2015-11-11 16:26:32 -07:00
Mike Place
e8ead2bfed
Allow for tcp transport in publish
2015-11-11 16:26:10 -07:00
Mike Place
e33b903e7b
Allow for tcp transport in mine
2015-11-11 16:25:53 -07:00
Mike Place
3d80e67a2d
Allow for tcp transport in auth
2015-11-11 16:25:39 -07:00
Justin Findlay
11163380cf
sdecode chunk name in state compiler
2015-11-11 16:17:37 -07:00
Justin Findlay
7f95c483e1
sdecode strings in file state
2015-11-11 16:16:11 -07:00
Justin Findlay
fe4d08526d
sdecode strings in highstate outputter
2015-11-11 16:13:54 -07:00
Colton Myers
da1a2773dd
Add singledispatch to the thin
2015-11-11 15:50:16 -07:00
Nicole Thomas
098d48ad26
Merge pull request #28789 from nmadhok/2015.8-customization-fix
...
Provide ability to enable/disable customization for newly create VMs using VMware salt-cloud driver
2015-11-11 15:48:57 -07:00
Metin Osman
82075c809c
Add logs and correct pylint error
2015-11-11 23:47:02 +01:00
Justin Findlay
30cc48e37f
Merge pull request #28786 from chrigl/fix-28783
...
closes #28783
2015-11-11 14:01:19 -07:00
Nitin Madhok
9294ebd984
Provide ability to enable/disable customization for new VMs. Fixes #28429
2015-11-11 15:43:36 -05:00
Christoph Glaubitz
ba6d814553
closes #28783
...
Passing family in get_saved_rules to _parse_conf correctly.
2015-11-11 21:04:25 +01:00
rallytime
e2b0fee57e
Don't change perms list, only existing perms should be a dictionary.
...
Refs #28269
2015-11-11 12:31:51 -07:00
Colton Myers
1e510be55b
Merge pull request #28768 from mrosedale/2015.8
...
2015.8
2015-11-11 12:29:11 -07:00
rallytime
7601647d69
Revert "rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list."
...
This reverts commit 07482211eb
2015-11-11 12:23:17 -07:00
Mark Rosedale
fbbbdcc02e
Update puppet.py
2015-11-11 13:38:28 -05:00
Mike Place
a6cad46301
Merge pull request #28772 from rallytime/rabbitmq-user-state
...
rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list.
2015-11-11 11:17:09 -07:00
Mike Place
d570ac48f4
Merge pull request #28774 from rallytime/bp-28725
...
Back-port #28725 to 2015.8
2015-11-11 11:16:27 -07:00
Nicole Thomas
8f1d0b636e
Merge pull request #28776 from rallytime/bp-28740-2015.5
...
Back-port #28740 to 2015.5
2015-11-11 11:02:03 -07:00
Nicole Thomas
76e69b4bff
Merge pull request #28777 from rallytime/bp-28740-2014.7
...
Back-port #28740 to 2014.7
2015-11-11 11:00:00 -07:00
Nicole Thomas
806d1b3669
Merge pull request #28775 from rallytime/bp-28740
...
Back-port #28740 to 2015.8
2015-11-11 10:57:24 -07:00
Mike Place
f273c46f07
Merge pull request #28755 from rallytime/vmware-utils
...
Move most vmware driver list_* functions to use salt.utils.vmware functions
2015-11-11 10:49:15 -07:00
Jarrod Moore
da5fac2b36
Back-port #28740 to 2014.7
2015-11-11 10:09:37 -07:00
Jarrod Moore
49256b7d90
Back-port #28740 to 2015.5
2015-11-11 10:07:06 -07:00
Jarrod Moore
8a2780da18
Add missing S3 module import
...
In the get_url method, a salt.utils.s3.query method call is made, but this won't work unless the salt.utils.s3 module is imported. This missing line breaks file.managed resources where source and source_hash attributes use s3:// URLs.
2015-11-11 10:03:20 -07:00
Quan Tong Anh
c3420461c3
boto_vpc: return an empty dict in case cannot get the route tables
2015-11-11 10:01:16 -07:00
rallytime
07482211eb
rabbitmq.list_user_permissions returns a dict, not a list. Don't expect a list.
...
Refs #28269
2015-11-11 09:45:35 -07:00
Mike Place
0d912bf0d4
Merge pull request #28744 from jfindlay/elementttree
...
import gate elementtree
2015-11-11 09:29:12 -07:00
Mike Place
b65e786351
Merge pull request #28758 from jfindlay/user
...
remove redundant logic in useradd execution module
2015-11-11 09:22:21 -07:00
Justin Findlay
6eced26013
Merge pull request #28757 from mbarrien/fix-pip-cmd
...
Bug fix: pip command to not quote spaces in cmd line args
2015-11-11 09:08:45 -07:00
Mark Rosedale
1c1a4b4410
Update puppet.py
...
Fix pylint errors.
2015-11-11 11:07:05 -05:00
Mike Place
356bf2987d
Merge pull request #28764 from multani/fix/docs
...
Various documentation fixes
2015-11-11 09:06:09 -07:00
