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
65,929 Commits 24 Branches 182 Tags 341 MiB
53e0b56b13
Commit Graph

65929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
dd5051c9e6 Correctly pop the path we added after loader is completed. 
Before this was doing a .pop() which would remove the last thing in sys.path, which is not necessarily the thing we added (in the case that an import modifies sys.path). The original fix was introduced in 4bf1d6838a, this simply ensures that we remove the item we added.
 2016-02-10 08:25:23 -08:00
rallytime
ced2d9f922 Revert #30217 
Reverts commit 1f68ce05bc.
Reverts commit 5264449fdb.

Conflicts:
	salt/runners/cloud.py
 2016-02-10 09:18:57 -07:00
justinta89
7c6864a958 Searchdomain to search 2016-02-10 08:58:37 -07:00
Marno van der Molen
52f06bb9f2 Fix copy/paste issue 2016-02-10 15:43:33 +01:00
Marno van der Molen
76b6b5189c Fix documentation for cores_per_socket 2016-02-10 14:13:32 +01:00
Marno van der Molen
cf70f06ade add support for numCoresPerSocket parameter in vmware driver 2016-02-10 14:09:51 +01:00
Bruno Binet
18cfdebb5e Add versionadded:: 2016.3.0 and update install instructions 2016-02-10 11:41:35 +01:00
Bruno Binet
e837aab073 Update PillarStack ext_pillar to latest version 
In particular this adds support for a new "remove" merge strategy.
See: https://github.com/bbinet/pillarstack
 2016-02-10 11:28:50 +01:00
Denys Havrysh
6370ddda9f Update RHEL installation guide 2016-02-10 09:57:17 +02:00
jmoore987
6f27d7a3d4 Merge pull request #1 from jmoore987/jmoore987-patch-1 
Fix issue where deploy_kwargs is missing.
 2016-02-09 21:11:38 -08:00
jmoore987
6e7fd1d3ea Fix issue where deploy_kwargs is missing. 
https://github.com/saltstack/salt/blob/develop/salt/cloud/__init__.py#L2104

expects to be able to find deploy_kwargs in the return dict of

https://github.com/saltstack/salt/blob/develop/salt/cloud/__init__.py#L2089

and

https://github.com/saltstack/salt/blob/develop/salt/cloud/__init__.py#L2114

throws an exception if it can't.
 2016-02-09 21:07:33 -08:00
Winston Liu
ce206c1e28 present and absent states added for cognito identity pool. 2016-02-09 16:54:05 -08:00
Winston Liu
248707069c cleaned up a few naming inconsistencies. 2016-02-09 16:52:51 -08:00
justinta89
1a5e37cf93 Updated to debian_ip_test to match with recent changes in #30989 2016-02-09 16:39:05 -07:00
Thayne Harbaugh
679fb7b639 Improve minion.kill documentation. 2016-02-09 16:25:06 -07:00
Zach Malone
271c44667d Fixing typos, many examples in here still don't work (ex. salt -t 15 '*' gpg.create_key throws errors), but some low hanging fruit is fixed. 2016-02-09 15:44:51 -07:00
Mike Place
7dafc6d601 Merge pull request #31055 from llua/zsh-completion 
zsh-completion: improve (module|runner).function name retrieval
 2016-02-09 15:13:46 -07:00
Thayne Harbaugh
63134a3a6c Add minion.kill to modules 2016-02-09 14:51:39 -07:00
Mike Place
b827713cee Merge pull request #30916 from rallytime/remove-external-ip-grains 
Remove salt/grains/external_ip.py file in Boron release
 2016-02-09 14:05:13 -07:00
Mike Place
23076719bc Merge pull request #31019 from carsonoid/salt-minion-config-fix 
minion config disable_modules: cmd is not a valid module name
 2016-02-09 13:14:38 -07:00
Mike Place
8704750cf9 Merge pull request #31050 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-09 13:13:34 -07:00
Mike Place
f13ffd4608 Merge pull request #31053 from cachedout/boto_test_fix 
Fix boto test failures
 2016-02-09 13:02:16 -07:00
Nitin Madhok
42a75938ce Adding functions to list available portgroups 2016-02-09 14:14:58 -05:00
Eric Cook
80dc92da1f zsh-completion: improve (module|runner).function name retrieval 
parsing ''salt-call -d'' was pretty errorprone and it finally broke. :D
Documention for some cron.* file.* functions isn't formatted with
leading whitespace, thus are picked up by the completer.

So now the completer parses salt-call sys.list_(runner_|)functions
 2016-02-09 14:12:25 -05:00
Mike Place
c73b5a4a66 Fix boto_secgroup 2016-02-09 11:52:15 -07:00
Mike Place
25bcc68357 Fix boto test failures 2016-02-09 11:50:26 -07:00
Mike Place
87f2816ef5 Merge pull request #31029 from twangboy/win_defaults 
Windows defaults to multiprocessing true
 2016-02-09 11:20:36 -07:00
Colton Myers
d86e014a39 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    README.rst
    salt/modules/yumpkg.py
 2016-02-09 11:11:36 -07:00
Mike Place
0dcdd0a2a7 Merge pull request #30998 from dmacvicar/dmacvicar-2015.8-27796 
add_key/reject_key: do not crash w/Permission denied: '/var/cache/salt/master/.dfn' (#27796)
 2016-02-09 10:57:36 -07:00
Mike Place
bc9dea9ae0 Merge pull request #30984 from abednarik/zip_options_addon 
ZIP Archives options addon.
 2016-02-09 10:56:00 -07:00
Mike Place
e773fc822a Merge pull request #31049 from twangboy/win_svc_docs 
Fix versionadded in win_service.config
 2016-02-09 10:55:07 -07:00
twangboy
98005255d1 Fix versionadded in win_service.config 2016-02-09 10:52:15 -07:00
Mike Place
c3f115724a Merge pull request #30987 from youngnick/add-back-localhost-peer-handling 
Changed glusterfs.peer() module so state can handle localhost peering attempts.
 2016-02-09 10:51:58 -07:00
Mike Place
8518655bfb Merge pull request #31042 from moltob/fix-archive-winpath 
Allow using Windows path in archive.extracted name attribute
 2016-02-09 10:47:20 -07:00
Mike Place
2fcda65b1f Merge pull request #31035 from AndrewPashkin/add-organizing-pillar-data-section-to-salt-formulas-docs 
Specify usage of `lookup` key in formulas pillars
 2016-02-09 10:45:11 -07:00
Mike Place
533e13e3ee Merge pull request #30981 from marnovdm/feature-proxmox4-lxc-compatibility 
Update salt-cloud proxmox driver for Proxmox 4/LXC
 2016-02-09 10:25:32 -07:00
Mike Place
1950359580 Merge pull request #31012 from terminalmage/fix-gitfs-provider-lc 
Fix gitfs/git_pillar/winrepo provider to allow lowercase values
 2016-02-09 10:24:25 -07:00
Mike Place
5eace6df93 Merge pull request #31016 from thatch45/thor_fix_cache 
Thor fix no minions bug
 2016-02-09 10:21:47 -07:00
Mike Place
3d8681b63e Merge pull request #31024 from jfindlay/dist_upgrade 
modules.aptpkg.upgrade: clarify dist-upgrade usage
 2016-02-09 10:20:57 -07:00
Mike Place
a0454ffb00 Merge pull request #31028 from twangboy/fix_installer 
Fix config overwrite by windows installer
 2016-02-09 10:20:24 -07:00
Mike Place
e56c97b89c Merge pull request #31045 from renner/patch-1 
Update link to the java API library project
 2016-02-09 10:13:24 -07:00
Mike Place
b2b5046652 Merge pull request #31018 from twangboy/uname_fix 
Backport uname fix from #30951
 2016-02-09 10:05:24 -07:00
Mike Place
071b9d4904 Merge pull request #31031 from terminalmage/issue31014 
More complete fix for #31014
 2016-02-09 10:04:41 -07:00
Mike Place
b62dcb7d30 Merge pull request #31027 from byronclark/bugfix/handle-ancient-pip-versions 
Handle ancient pip versions
 2016-02-09 10:04:20 -07:00
Mike Place
21187d42a6 Merge pull request #30913 from jtand/deprecations 
Deprecated code removed.
 2016-02-09 09:59:36 -07:00
Johannes Renner
9d0d5fa9e6 Update link to the java library project 
The github project name was recently changed as part of a larger refactoring, therefore we should update the link here as well.
 2016-02-09 16:57:54 +01:00
justinta89
e07a667dde Lint Fix 2016-02-09 08:46:22 -07:00
Mike Pagel
9dcc617a53 Allow using Windows path in archive.extracted name attribute, including drive letter colon and backslashes. 2016-02-09 15:28:33 +01:00
Denys Havrysh
afdaefbf3d Add systemctl examples for RHEL 7 to the installation guide 2016-02-09 14:48:26 +02:00
Denys Havrysh
069a661eb1 Correct ZeroMQ4 repo install guide for RHEL 2016-02-09 14:33:18 +02:00