valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,910 Commits 24 Branches 182 Tags 341 MiB
8e3fd82718
Commit Graph

65910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
0e31918f2f Merge pull request #31098 from saltstack/revert-30913-deprecations 
Revert "Deprecated code removed. "
 2016-02-10 12:32:00 -07:00
Colton Myers
94c42d61da Merge pull request #31096 from saltstack/revert-30908-boron_setup 
Revert "setup.py: remove Boron deprecated code"
 2016-02-10 12:31:54 -07:00
Mike Place
efe47eb7e1 Merge pull request #30917 from rallytime/remove-botocore-aws-driver 
Remove deprecated botocore_aws driver in Boron release
 2016-02-10 12:07:14 -07:00
Mike Place
e2a081b662 Merge pull request #31101 from cachedout/lint_31060 
Lint 31060
 2016-02-10 12:06:40 -07:00
Mike Place
a52e577edb Lint 2016-02-10 12:05:57 -07:00
Mike Place
313b82a0ab Merge pull request #30947 from rallytime/remove-libcloud-aws-driver 
Remove deprecated libcloud_aws driver in Boron release
 2016-02-10 12:01:57 -07:00
Mike Place
58fd895b35 Merge pull request #31089 from AndreasBackx/develop 
Note added to pyenv docs requiring git.
 2016-02-10 11:54:35 -07:00
Mike Place
94fa76831f Merge pull request #31093 from techhat/spmfix 
Ensure double directories don't get created
 2016-02-10 11:53:47 -07:00
Justin Findlay
6c303b99c2 states.x509: docs: peer.sls -> peer.conf 
Fixes #31069.
 2016-02-10 11:53:35 -07:00
Mike Place
c015ca865c Merge pull request #31095 from jfindlay/link_doc 
modules.file, states.file: explain symbolic links
 2016-02-10 11:53:24 -07:00
Mike Place
99d2e55afa Merge pull request #31054 from nmadhok/portgroups-list 
Adding functions to list available port groups in VMware salt-cloud driver
 2016-02-10 11:51:31 -07:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
Justin Findlay
ae10c71b6b setup.py: remove Boron deprecated code 2016-02-10 11:33:41 -07:00
Justin Findlay
7bfb28c5db Revert "setup.py: remove Boron deprecated code" 2016-02-10 11:27:08 -07:00
Mike Place
3699e5438d Merge pull request #31073 from jmoore987/develop 
Fix issue where deploy_kwargs is missing.
 2016-02-10 11:26:07 -07:00
Justin Findlay
7d9df6b26c modules.file, states.file: explain symbolic links 
Fixes #31056.
 2016-02-10 11:18:53 -07:00
Mike Place
4d6706b3e7 Merge pull request #31061 from rallytime/revert-breakage 
Revert #30217 - was causing salt-cloud -a breakage
 2016-02-10 11:13:59 -07:00
Mike Place
482eea9883 Merge pull request #31090 from rallytime/bp-30542 
Back-port #30542 to 2015.8
 2016-02-10 11:06:38 -07:00
Mike Place
21997ea264 Merge pull request #31063 from zmalone/develop 
Fixing typos,
 2016-02-10 11:06:24 -07:00
Joseph Hall
4f4c8877ad Ensure double directories don't get created 2016-02-10 11:04:54 -07:00
Mike Place
0b6636694f Merge pull request #31076 from bbinet/update-ext_pillar-stack 
Update PillarStack ext_pillar to latest version
 2016-02-10 10:48:20 -07:00
Mike Place
5dcaa8d387 Merge pull request #31085 from jacksontj/2015.8 
Correctly remove path we added after loader is completed
 2016-02-10 10:47:21 -07:00
Winston Liu
efc374f968 'comment' fix up's in the returned dictionary. 2016-02-10 09:42:14 -08:00
Mike Place
27bf83fa59 Merge pull request #31037 from vutny/correct-doc-install-on-rhel 
Update RHEL installation guide to reflect latest repo changes
 2016-02-10 10:36:04 -07:00
jmoore987
e421f662b1 Clean up lint error 
Remove some trailing whitespace.
 2016-02-10 09:34:12 -08:00
Mike Place
8348356c5d Merge pull request #31077 from marnovdm/feature-vmware-cores-per-socket 
Add support for numCoresPerSocket parameter in vmware driver
 2016-02-10 10:26:39 -07:00
Winston Liu
7ae0f8d7e6 fixed few lint warnings. 2016-02-10 09:23:19 -08:00
Stephen D. Spencer
67a713f2f6 Some 3rd-party modules (e.g. gnupg) define custom log levels that emit 
at INFO level and above.  This patch sets the color data lookups to
default to TextFormat('reset') rather than producing a stack trace
every time a log message is generated from an affected module.
 2016-02-10 10:15:32 -07:00
Andreas Backx
90c12f584e Note added to pyenv docs requiring git. 2016-02-10 18:09:44 +01:00
Winston Liu
054231605d minor fix up on if conditions. 2016-02-10 08:52:48 -08:00
Winston Liu
6df88a73db added helper function to look up pillar for SupportedLoginProviders and OpenIdConnectProviderARNs if the input into pool_present for these parameters were of string_types. 2016-02-10 08:25:51 -08:00
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