valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,482 Commits 24 Branches 182 Tags 341 MiB
860de8d877
Commit Graph

57482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
6b8769b43a Update refs to point to renamed salt.utils.itertools.split() 2015-08-31 23:18:47 -05:00
Erik Johnson
c322aa1b41 Move salt.utils.itersplit() to salt.utils.itertools.split() 
In the interest of not making salt.utils any more cluttered.
 2015-08-31 23:18:47 -05:00
Jacob Hammons
5cca52a3c1 Fixed windows installer paths 
Refs #25567
 2015-08-31 20:20:44 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key 
#24510
 2015-08-31 20:00:30 -06:00
Jacob Hammons
439570f917 More updates to docker.exec_driver 2015-08-31 16:41:35 -06:00
Jacob Hammons
673fe1af7d Updates to docker.exec_driver 2015-08-31 16:33:58 -06:00
Jacob Hammons
23d6960f12 Added doc for dockerng minion configuration options 2015-08-31 16:08:09 -06:00
Jacob Hammons
992edc3bb8 Doc bug fixes 
Refs #26192
Refs #26638
Refs #26644
Refs #26108
 2015-08-31 16:05:50 -06:00
Justin Findlay
e3aec144aa Merge pull request #26796 from jacobhammons/state-docs 
Add doc for __states__
 2015-08-31 15:37:29 -06:00
Jacob Hammons
06ac3bed42 Fixed typo 2015-08-31 13:53:59 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates. 
Refs #21214
 2015-08-31 13:51:31 -06:00
Joseph Hall
da161b9516 Merge pull request #26793 from rallytime/fix-name-stacktrace 
Don't stacktrace if "name" is specified as a minion id in a map file
 2015-08-31 13:24:25 -06:00
rallytime
8601e4b341 Don't stacktrace if "name" is specified as a minion id in a map file 
Fixes #24021
 2015-08-31 12:36:28 -06:00
Joseph Hall
7c8d0a09f6 Merge pull request #26790 from rallytime/saltify_docs 
Update Saltify docs to be more accurate and helpful
 2015-08-31 12:17:31 -06:00
rallytime
d53754f2b7 Update Saltify docs to be more accurate and helpful 2015-08-31 12:02:23 -06:00
Justin Findlay
70d0268c83 Merge pull request #26787 from jfindlay/imp 
merge #26775
 2015-08-31 11:52:45 -06:00
Justin Findlay
e5bbf59ec7 disable import lint in run.py 2015-08-31 11:25:54 -06:00
Mike Place
ae9d39c637 Merge pull request #26764 from sjorge/is_proxy-sunos 
salt.utils.is_proxy() is no longer always true on SunOS/Illumos/SmartOS
 2015-08-31 08:42:27 -06:00
Mike Place
645998dbd3 Merge pull request #26759 from terminalmage/bp-26726 
Backport PR #26726 to 2015.5 branch
 2015-08-31 08:39:20 -06:00
Mike Place
517f47570a Merge pull request #26772 from sjorge/vmadm-2015.8-fixup 
pull in smartos 'virt' module from develop
 2015-08-31 08:33:30 -06:00
Anton D
8aef725243 Restore blank lines again. 2015-08-30 22:37:13 +12:00
Anton D
1710070f61 Restore blank line. 2015-08-30 22:33:16 +12:00
Anton D
59d61a8dea os module no longer required. 2015-08-30 22:29:23 +12:00
Anton D
f1b8d0d509 Add missing imports. 2015-08-30 22:27:45 +12:00
Anton D
7bd8809e23 Fix some non portable exitcodes. Fixes #26773 2015-08-30 21:34:58 +12:00
Pedro Algarvio
b0a8b29eb4 Merge pull request #26726 from terminalmage/git-latest-remote-redaction 
Redact HTTPS Basic Auth in states/funcs which deal with git remotes
 2015-08-30 09:05:22 +01:00
Erik Johnson
1ca5f82008 raise the exception, don't return it! 2015-08-29 21:14:20 -05:00
Erik Johnson
6d4a69a72a Rename arguments in salt.utils.url.add_http_basic_auth 2015-08-29 21:14:20 -05:00
Erik Johnson
d30eaee653 Add http basic auth tests 2015-08-29 21:14:20 -05:00
Erik Johnson
a605607709 Remove git unit tests, moving them to salt.utils.url tests 2015-08-29 21:14:20 -05:00
Erik Johnson
85413a7abd Remove unused imports 2015-08-29 21:14:20 -05:00
Erik Johnson
ee5453c605 Redact HTTPS Basic Auth data from remote URLs in comments and changes dict 2015-08-29 21:14:20 -05:00
Erik Johnson
db99cabc58 Automatically redact HTTPS basic auth 
Also add redact_auth param to remotes and remote_get funcs
 2015-08-29 21:14:19 -05:00
Erik Johnson
76f9757a53 Add support for callbacks to influence what information about commands is logged 2015-08-29 21:10:54 -05:00
Erik Johnson
fc2fd3af54 Add HTTPS Basic Auth funcs to salt.utils.url 2015-08-29 21:10:54 -05:00
Jorge Schrauwen
746cce0849 removed smartos_legacy.py as we will be keeping it around as smartos_virt.py 2015-08-29 12:19:03 +00:00
Jorge Schrauwen
76173ec9c8 imported smartos_virt.py from develop 2015-08-29 12:18:34 +00:00
Jorge Schrauwen
acceebe053 lint fixes 2015-08-29 07:44:27 +00:00
Colton Myers
28b67df931 Merge pull request #26769 from terminalmage/git-latest-version-check 
Use --track to set tracking branch on older git versions
 2015-08-29 01:00:48 -06:00
Erik Johnson
c53e41fdec Remove unnecessary warnings from log 2015-08-28 23:11:34 -05:00
Erik Johnson
75a51cbceb Remove redundant function for retrieving git version 2015-08-28 23:03:08 -05:00
Erik Johnson
52d354a7db Use --track to set tracking branch on older git versions 2015-08-28 22:54:25 -05:00
Erik Johnson
9655e83e7e No need to support alternate user to run git --version 2015-08-28 22:54:00 -05:00
Justin Findlay
46a4bbd0e7 Merge pull request #26768 from garethgreenaway/26628_2015_5_ipset_fixes 
Fixes to ipset in 2015.5 for #26628
 2015-08-28 21:24:07 -06:00
Colton Myers
203cf7a55e Merge pull request #26765 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-28 19:28:33 -06:00
Gareth J. Greenaway
f0c6090c7e Fixing issue when information returned from ipset isn't in the format we expect and it causes an exception. 2015-08-28 18:28:27 -07:00
Colton Myers
3b696d97b3 Fix lint 2015-08-28 17:39:41 -06:00
Joseph Hall
eb82c89371 Merge pull request #26761 from sjorge/spm-esky 
fix SPM paths on smartos/illumos esky
 2015-08-28 16:42:18 -06:00
Colton Myers
b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/linode.py
    salt/grains/ssds.py
    salt/modules/git.py
    salt/modules/pip.py
    tests/integration/cloud/providers/gogrid.py
    tests/integration/cloud/providers/linode.py
    tests/integration/cloud/providers/msazure.py
    tests/integration/cloud/providers/rackspace.py
    tests/unit/modules/pip_test.py
 2015-08-28 16:33:54 -06:00
Jorge Schrauwen
6bfc9c168f salt.utils.is_proxy() is no longer always true on SunOS/Illumos/SmartOS 2015-08-28 22:04:13 +00:00