valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,028 Commits 24 Branches 182 Tags 341 MiB
1e1a74fd61
Commit Graph

59028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
1e1a74fd61 Add backports_abc and singledispatch_helpers to thin as well 2015-11-12 10:28:35 -07:00
Colton Myers
da1a2773dd Add singledispatch to the thin 2015-11-11 15:50:16 -07:00
Colton Myers
1e510be55b Merge pull request #28768 from mrosedale/2015.8 
2015.8
 2015-11-11 12:29:11 -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
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
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
mrosedale
59bd6aef5c Merge pull request #1 from mrosedale/mrosedale-patch-1 
Update puppet.py
 2015-11-11 09:49:02 -05:00
mrosedale
c26ea916aa Update puppet.py 
Update that fixes #28692 where puppet.noop results in an empty puppet run or when providing arguments to puppet.run without setting agent as the first argument results in an empty puppet run.
 2015-11-11 09:47:01 -05:00
Jonathan Ballet
1a31b69763 doc: fix documentation formatting in salt.utils.jinja 2015-11-11 12:01:10 +01:00
Jonathan Ballet
59c105b4b9 doc: fix documentation formatting in salt.states.boto_iam* 2015-11-11 12:00:59 +01:00
Jonathan Ballet
cbb167c8ee doc: fix documentation formatting in in salt.modules.lxc 2015-11-11 12:00:17 +01:00
Jonathan Ballet
cb03a89e52 doc: fix documentation formatting in salt.modules.aptpkg 2015-11-11 12:00:08 +01:00
Justin Findlay
dbd582cd8d fix doc formatting in user.present state 2015-11-10 21:57:08 -07:00
Justin Findlay
3824d2e9fc only change/report new home when createhome is True 2015-11-10 21:56:34 -07:00
Justin Findlay
3fbf81611f remove redundant logic in useradd execution module 
Fixes #28726.
 2015-11-10 21:55:08 -07:00
Justin Findlay
d77c24e70d Merge pull request #28752 from aboe76/suse_tumbleweed_grain 
Update openSUSE grain for tumbleweed
 2015-11-10 20:54:37 -07:00
Justin Findlay
a620bc5596 Merge pull request #28713 from hexedpackets/fix-consul-module 
Rename consul.list to consul.list_keys.
 2015-11-10 17:57:23 -07:00
Michael Barrientos
6df6cb82a6 Fix pip command to not quote spaces in cmd line args 2015-11-10 16:34:18 -08:00
Justin Findlay
e321d60002 import gate elementtree in artifactory module 2015-11-10 17:25:18 -07:00
Justin Findlay
f20f3f697b import gate elementtree in boto_iam state 2015-11-10 17:25:18 -07:00
Justin Findlay
9845d2f2c6 import gate elementtree in boto_cfn state 
Fixes #28655.
 2015-11-10 17:25:18 -07:00
rallytime
5abe010023 Move most vmware driver list_* functions to use salt.utils.vmware functions 2015-11-10 16:23:27 -07:00
Niels Abspoel
764cb16ef0 Update openSUSE grain for tumbleweed 
After discussion with Richard Brown from Opensuse,
Added openSUSE Tumbleweed grain for future release

As it stands the following distributions of Suse are:
openSUSE Leap
openSUSE Tumbleweed
openSUSE (numbered releases)
SLES (Suse Linux Enterprise Server)
SLED (Suse Linux Enterprise Desktop)

For reference see:
https://bugzilla.suse.com/show_bug.cgi?id=954135
 2015-11-10 20:02:18 +01:00
William Huba
0889907b3c Make consul.list a function alias. 
Fixes #28712.
 2015-11-10 10:25:17 -05:00
jacobhammons
decc31a766 Merge pull request #28719 from jacobhammons/spm 
removed dependencies info from docs
 2015-11-09 17:04:53 -07:00
Colton Myers
989069f44a Merge pull request #28709 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-09 16:38:27 -07:00
Jacob Hammons
d7017be031 removed dependencies info from docs 2015-11-09 16:07:17 -07:00
Mike Place
8d5ab15c16 Merge pull request #28710 from rallytime/fix-28469 
Pass kwargs correctly to _get_group from get_group_id
 2015-11-09 15:29:09 -07:00
Colton Myers
2d04ddc108 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-09 15:28:14 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore 
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
 2015-11-09 15:22:01 -07:00
rallytime
0571608f5d Pass kwargs correctly to _get_group from get_group_id 
Fixes #28469
 2015-11-09 12:34:36 -07:00
Pedro Algarvio
f40c617bad Merge pull request #28705 from cachedout/tornado_http_headers 
Account for new headers class in tornado 4.3
 2015-11-09 19:24:33 +00:00
Colton Myers
aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/pillar/s3.py
 2015-11-09 12:12:24 -07:00
Mike Place
cfa0cec19c Merge pull request #28698 from rallytime/bp-28530 
Back-port #28530 to 2015.8
 2015-11-09 11:11:51 -07:00
Mike Place
604a7b4199 Merge pull request #28699 from rallytime/bp-28670 
Back-port #28670 to 2015.5
 2015-11-09 11:10:58 -07:00
Mike Place
2fe9e2e7c5 Merge pull request #28700 from rallytime/bp-28679 
Back-port #28679 to 2015.8
 2015-11-09 11:07:44 -07:00
Mike Place
7bd3eb8370 Merge pull request #28703 from rallytime/bp-28690 
Back-port #28690 to 2015.5
 2015-11-09 11:01:57 -07:00
Mike Place
7ac6cde1ee Account for new headers class in tornado 4.3 
This started to fail with the test:  integration.netapi.rest_tornado.test_app.TestWebhookSaltAPIHandler.test_post

This happened with the introduction of Tornado 4.3 wherein headers were delivered as a subclass of a python dict, called HTTPHeaders http://www.tornadoweb.org/en/stable/releases/v4.3.0.html

This in turn caused msgpack serialization errors as we couldn't figure out how to serialize the new class. (Somewhat ironically, since the upstream change was made to better support serialization, but c'est la vie). Instead of trying to give hints to our serialialization lib, it seemed more sensible just to cast this back into a python dictionary before we put it onto the event bus.

Tested against tornado 4.3 and 4.2
 2015-11-09 10:56:12 -07:00
Nicole Thomas
8ccea2a855 Merge pull request #28695 from s0undt3ch/2015.8 
[2015.8] Update to latest bootstrap script v2015.11.09
 2015-11-09 10:50:15 -07:00
Nicole Thomas
2a40f57b93 Merge pull request #28694 from s0undt3ch/2015.5 
[2015.5] Update to latest bootstrap script v2015.11.09
 2015-11-09 10:49:53 -07:00