Commit Graph

62575 Commits

Author SHA1 Message Date
Eric Cook
a45d869b57 zsh-completion: improved cache validation
allows a user to control how long to keep various caches without
defining their own function to override ours.

The default duration was changed from 7 days to 1 day. which seems a bit
more useful for people who don't have a static number of hosts like
myself.
2015-11-22 00:30:58 -05:00
Nicole Thomas
4dd606a0e3 Merge pull request #29070 from quantonganh/boto-ec2-exists
boto_ec2: missing region when checking existence of an EC2 instance
2015-11-21 08:58:04 -07:00
Quan Tong Anh
3b202efadc boto_ec2: missing region when checking existence of an EC2 instance 2015-11-21 08:57:24 -07:00
Nicole Thomas
0ca7353bb3 Merge pull request #29087 from techhat/vboxmanage
Initial commit of vboxmanage execution module
2015-11-21 08:46:09 -07:00
Nicole Thomas
bb28b9186b Merge pull request #29090 from gtmanfred/2015.8
clean up novaclient module
2015-11-21 08:43:58 -07:00
Xiuming Chen
f5734423a4 Compare gem versions as a string. 2015-11-21 08:41:06 -07:00
Nicole Thomas
eaf19fb7de Merge pull request #29093 from cxmcc/compare-gem-version-as-string
Compare gem versions as a string.
2015-11-21 08:39:38 -07:00
Nicole Thomas
4ff54c6429 Merge pull request #29095 from terminalmage/pygit2-warning
Add warning about pygit2 API instability
2015-11-21 08:38:59 -07:00
Nicole Thomas
27160b0454 Merge pull request #28919 from cro/hue_proxy_backport
Update Philips Hue proxy minion to support __proxy__ instead of proxymodule stored in __opts__
2015-11-21 08:31:36 -07:00
Erik Johnson
139f5ba4c3 Add warning about pygit2 API instability 2015-11-20 22:34:58 -06:00
Daniel Wallace
2aab45f9d2 clean up novaclient module
get the client a different way, and add specifying the version.
2015-11-20 20:18:23 -06:00
Xiuming Chen
b077ab922a Compare gem versions as a string. 2015-11-20 16:51:20 -08:00
Tetja Rediske
a92dda248e Fixed uses handling and removed more quoting leading to wrong atom syntax 2015-11-20 21:58:42 +01:00
Nicole Thomas
d8a2018bc8 Merge pull request #29084 from rallytime/bp-29055
Back-port #29055 to 2015.5
2015-11-20 13:57:54 -07:00
Nicole Thomas
b5cff1a351 Merge pull request #29083 from rallytime/bp-29053
Back-port #29053 to 2015.5
2015-11-20 13:57:38 -07:00
Joseph Hall
fd828b9489 Lint 2015-11-20 12:41:53 -07:00
Joseph Hall
42825f5a12 Linting 2015-11-20 12:19:23 -07:00
Joseph Hall
a66afb01cf Initial commit of vboxmanage execution module 2015-11-20 11:47:54 -07:00
Pedro Algarvio
88c0354c0c Merge pull request #29065 from cachedout/issue_28810
Handle failures inside python's inspect if a module is reloaded
2015-11-20 18:10:42 +00:00
Mike Place
52e650aed9 Add section to style guide
A brief discussion of variable naming standards in Salt.
2015-11-20 09:23:39 -07:00
Kevin London
f1884de0e7 Update rabbitmq_user.py
Corrected spacing to make it clear that the permissions were a level below the vhost name.
2015-11-20 09:21:22 -07:00
Tetja Rediske
f3d1ba1509 We can't query installed use flags for a non installed pkg. Also one if is enough... 2015-11-20 17:05:55 +01:00
Mike Place
4767503eb2 Remove trailing whitespace 2015-11-20 08:53:27 -07:00
Mike Place
b06f4b25cd Merge pull request #29054 from jtand/file_test
Adjusted the expected output to match the actual results
2015-11-20 08:51:33 -07:00
Mike Place
a6f3188218 Merge pull request #29060 from cachedout/log_pack
Pack log handlers with grains and mods
2015-11-20 08:50:59 -07:00
Jorge Schrauwen
a2c473e4de Message about virt-what makes no sense on SunOS 2015-11-20 13:40:23 +00:00
Tetja Rediske
96566d3060 We can't query installed use flags for a non installed pkg 2015-11-20 12:40:55 +01:00
Erik Johnson
1e6c46f554 pygit2: Properly resolve base saltenv from tag ref
Fixes #27432.
2015-11-20 02:39:44 -06:00
Erik Johnson
0c592ab552 Support string whitelist/blacklist 2015-11-20 02:38:27 -06:00
Quan Tong Anh
7e9155bf90 boto_ec2: missing region when checking existence of an EC2 instance 2015-11-20 15:28:52 +07:00
Christophe Drevet-Droguet
89e7578d21 loader test for external grains deep merge (non-functional)
This test is disabled until we have a way to reload the minion, or
just the custom grains, with the grains_deep_merge option set.
2015-11-20 08:44:29 +01:00
Erik Johnson
744487864d Fix base branch detection for git_pillar
Resolves #29015.
2015-11-20 01:19:44 -06:00
Erik Johnson
1cd9a4d1b4 Add some debug logging for git_pillar
This adds logging showing which directory and which environment are
being processed for each pillar_dir being evaluated.
2015-11-20 01:18:20 -06:00
Erik Johnson
fac588c0bb Add HEAD ref in git_pillar/winrepo checkout
This works around a traceback which occurs due to an API change in pygit
0.21, which occurs when attempting to check out a branch other than the
default. salt.utils.gitfs doesn't actually clone the repository, it adds
a remote and fetches it, so the local ref for HEAD is not present.
pygit2 tries to reference it in the process of checking out a
non-default branch, resulting in a KeyError.

This workaround checks for the existence of the local ref corresponding
to HEAD, and creates it if it was not present.

Fixes #28311.
2015-11-20 00:52:46 -06:00
Mike Place
c5b667f048 Handle failures inside python's inspect if a module is reloaded
Python has a known issue wherein calls to the inspect module which traverse the frame stack will fail if a module has been reloaded.

This caused a serious bug wherein certain uses of the depends decorator would fail hard and prevent the salt module from being initialized and loaded.

This works around that by simply ignoring the inspect failure.

cc: @sjorge (This may impact your fix for esky in #25946. Please have a look.)
2015-11-19 16:30:17 -07:00
makearl
b091cc1910 Updating deprecation path to be Nitrogen 2015-11-19 15:58:39 -06:00
Mike Place
714ef8ff27 Merge pull request #29057 from lyft/file-manage-local-source-list
Add local file support for file.managed source list
2015-11-19 14:57:34 -07:00
Mike Place
30d0e7a0c2 Merge pull request #29008 from k00mi/develop
Make systemd service state less slow
2015-11-19 14:54:48 -07:00
Mike Place
040d89e0ad Merge pull request #29051 from pass-by-value/manage_salt_proxy
Manage salt proxy
2015-11-19 14:54:02 -07:00
Mike Place
601d9b7389 Remove unused import 2015-11-19 14:51:47 -07:00
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Anderson
978cbbeee0 Merge pull request #1 from jfindlay/utf_diff
file state: integration test difflib version check
2015-11-19 14:13:48 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00
Lukas Braun
ad256b9a89 Merge pull request #1 from jfindlay/dtest
systemd module: new unit test for available
2015-11-19 21:59:00 +01:00
Justin Findlay
9a4959a42b systemd module: new unit test for available 2015-11-19 13:29:08 -07:00
Mike Place
c7e3670324 Merge pull request #29058 from TronPaul/requests-connection-error
ConnectTimeout does not exist in all requests>=1.0.0
2015-11-19 13:16:53 -07:00
Mike Place
b5a92a5fc3 Pack log handlers with grains and mods
Refs #28999
2015-11-19 13:07:30 -07:00
Mike Place
645f687b54 Merge pull request #29055 from cachedout/style_variable_length
Add section to style guide
2015-11-19 12:59:46 -07:00
Mike Place
e2959aab45 Merge pull request #29053 from kevinlondon/patch-1
Update rabbitmq_user.py
2015-11-19 12:35:08 -07:00
Aditya Kulkarni
a9f70d53ab Change to salt.utils.fopen 2015-11-19 14:34:32 -05:00