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
50,546 Commits 24 Branches 182 Tags 341 MiB
6d31b8918f
Commit Graph

50546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
6d31b8918f Merge pull request #31622 from jfindlay/query_doc 
doc/topics/tutorials/http: update query decoding docs
 2016-03-02 11:23:44 -07:00
Justin Findlay
4e48fec806 doc/topics/tutorials/http: update query decoding docs 
Fixes #31614.
 2016-03-02 10:17:22 -07:00
Mike Place
dbf6e0786c Merge pull request #31558 from cachedout/ensure_ssh_installed 
Don't stacktrace if ssh binary is not installed with salt-ssh
 2016-02-29 15:15:44 -07:00
Mike Place
cecc6e0a5f Don't stacktrace if ssh binary is not installed with salt-ssh 2016-02-29 11:26:35 -07:00
Mike Place
060a60fd90 Merge pull request #31521 from terminalmage/issue24753 
salt-ssh: Fix race condition when caching files to build the thin tarball
 2016-02-29 08:32:22 -07:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
Erik Johnson
d9370a8041 Update cp module salt-ssh wrapper to use new cachedir param 2016-02-26 16:07:47 -06:00
Erik Johnson
0320494b1d Update the SSH state module wrappers to pass an alternate cachedir 2016-02-26 16:07:47 -06:00
Erik Johnson
65bdcb3afa Accept and pass through the alternate cachedir when prepping the thin tar 2016-02-26 16:07:47 -06:00
Erik Johnson
c3f7a2f2e5 Add ability to specify an alternate base dir for file caching 
This commit extends the fileclient such that it is possible to override
the base directory for file caching. The new "cachedir" param can be
either a relative path or an absolute path. If it is relative, the path
will be appended to __opts__['cachedir'], and if it is absolute then it
will take the place of __opts__['cachedir'].
 2016-02-26 16:07:47 -06:00
Mike Place
92f8f89218 Merge pull request #31497 from rallytime/remove-timeout-dup 
Remove duplicate "timeout" definition in Roster docs
 2016-02-26 08:01:30 -07:00
rallytime
83e6480d20 Remove duplicate "timeout" definition in Roster docs 2016-02-25 14:05:38 -07:00
Mike Place
da001bcb49 Merge pull request #31472 from rallytime/update-contributing-docs 
Update contributing docs
 2016-02-25 09:05:59 -07:00
rallytime
5871e4d1e0 Update contributing docs 2016-02-24 15:38:37 -07:00
Mike Place
f35e2dd1d3 Merge pull request #31461 from DSRCompany/issues/30183_fix_multimaster_failover_2015.5 
Set auth retry count to 0 if multimaster mode is failover.
 2016-02-24 10:15:30 -07:00
Dmitry Kuzmenko
3d09c3b7a3 Set auth retry count to 0 if multimaster mode is failover. 
Backport of PR #31382 into 2015.5.
 2016-02-24 19:00:32 +03:00
Nicole Thomas
26733ce988 Merge pull request #31442 from sastorsl/salt-modules-file.py-copy-check-src 
Add os.path.exists(src) to file.py, def copy
 2016-02-23 16:40:03 -07:00
Nicole Thomas
e480727d27 Merge pull request #31441 from cachedout/issue_30739 
Include localhost minions in presence detection for runner
 2016-02-23 16:36:59 -07:00
Stein Arne Storslett
0a4132866d removed lint in the exception string 2016-02-23 22:20:55 +01:00
Stein Arne Storslett
f8b5d498c3 Add os.path.exists(src) to file.py, def copy 
Fixes #31356
 2016-02-23 21:03:25 +01:00
Mike Place
ffcfad1570 Include localhost minions in presence detection for runner 
Closes #30739
 2016-02-23 12:35:07 -07:00
Mike Place
91ff95f093 Merge pull request #31416 from carlwgeorge/selinux_doc_fix 
selinux module documentation fix
 2016-02-22 14:49:28 -07:00
Carl George
0e6846d72e selinux module documentation fix 
Selinux commands were moved from policycoreutils-python package to
policycoreutils-python-utils package in Fedora 23.  The docstring needs to be
updated to reflect that.

reference: http://pkgs.fedoraproject.org/cgit/rpms/policycoreutils.git/commit/?id=3c89d24456836170bff46efe449a8fb076996a5d
 2016-02-22 14:55:37 -06:00
Mike Place
7d01979898 Merge pull request #31336 from terminalmage/config-validation-logging 
Improve config validation logging
 2016-02-22 12:34:24 -07:00
Mike Place
fed096a29d Merge pull request #31374 from sjorge/solarish_hwaddr 
fix for #31369
 2016-02-22 09:22:21 -07:00
Jorge Schrauwen
bdf2576dfb missed a .format and messed up the join 2016-02-19 22:57:58 +00:00
Jorge Schrauwen
bbd2fdc96d fix for illumos/solaris hwaddr 2016-02-19 22:45:14 +00:00
jacobhammons
6ee17f905b Merge pull request #31339 from jacobhammons/dot7prev 
changed latest release to 2015.8.7
 2016-02-18 17:30:24 -07:00
Jacob Hammons
07120a8d48 changed latest release to 2015.8.7 2016-02-18 17:29:44 -07:00
Erik Johnson
795008bad1 Improve config validation logging 
This corrects the formatting on the error messages, and adds an error
condition when a type that should be a str or bool is specified as a
list or dict.
 2016-02-18 17:47:53 -06:00
Mike Place
cd3400e67e Merge pull request #31288 from notpeter/ssh_known_hosts_docs 
Improve salt.states.ssh_known_hosts documentation.
 2016-02-17 15:09:18 -07:00
Peter Tripp
3f573d89a2 Improve salt.states.ssh_known_hosts documentation. 2016-02-17 12:59:43 -08:00
Mike Place
875d9925fa Merge pull request #31183 from heyfife/fix-gce-named-static-ip-reservation 
Fixed named external_ip reservation/re-use code in gce driver.
 2016-02-17 12:02:27 -07:00
Mike Place
e56c402c0c Merge pull request #31032 from terminalmage/issue31001 
(2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed
 2016-02-17 12:02:03 -07:00
Mike Place
cec69b74f0 Merge pull request #31264 from sjorge/if_missing-155-fix 
fix if_missing gets appended to dirs list, take III
 2016-02-17 10:12:25 -07:00
Jorge Schrauwen
545edbf5e1 fix if_missing gets appended to dirs list, take III 2016-02-17 07:09:47 +00:00
Erik Johnson
42daea4509 yumpkg.py: Remove repoquery usage everywhere but check_db 2016-02-16 17:47:48 -06:00
Erik Johnson
50befbc149 backport salt.utils.pkg.rpm to 2015.5 2016-02-16 17:24:04 -06:00
Ryan Fife
26774e2323 Fixed named external_ip reservation/re-use code. 
When using a named external_ip, an exception was thrown every time.
Updated the __create_orget_address call and return variable to use
the correct variable.
 2016-02-12 21:44:43 +00:00
Mike Place
fa3f474de9 Merge pull request #31110 from cachedout/fixup_30730 
Fixup 30730
 2016-02-10 14:37:55 -07:00
Mike Place
5bf5848e04 Fixup unit test 2016-02-10 14:36:21 -07:00
Erik Johnson
a1ad14994a Move salt.utils.itersplit() to salt.utils.itertools.split() 
In the interest of not making salt.utils any more cluttered.
 2016-02-09 01:26:31 -06:00
Erik Johnson
5b8646ce64 Ignore failure to install new enough dnf-plugins-core 
This prevents the pkg.check_db call if 0.1.15 is not able to be
installed.
 2016-02-08 22:46:51 -06:00
Erik Johnson
defe0859fd Ensure that dnf-plugins-core 0.1.15 is installed 2016-02-08 22:45:56 -06:00
Mike Place
1c699a1664 Merge pull request #30974 from rallytime/bp-30949 
Back-port #30949 to 2015.5
 2016-02-08 09:38:46 -07:00
Joseph Hall
ff6542f593 Replace cfdisk with sfdisk 2016-02-06 11:31:41 -07:00
Mike Place
c7f87cc371 Merge pull request #30942 from rallytime/bp-30897 
Back-port #30897 to 2015.5
 2016-02-05 12:00:55 -07:00
Massimiliano Torromeo
885e00ba54 Only remove the word linux from distroname when its not part of the name 
This will now still replace "CentOS Linux" with "CentOS" while leaving "CloudLinux" unmodified.
Fixes #28951
 2016-02-05 10:01:43 -07:00
Michele Preziuso
f558f68e0a Fixes pylint warnings 2016-02-05 08:50:27 +00:00
jacobhammons
35b7f62669 Merge pull request #30922 from jacobhammons/prev-rel-notes 
Rev latest version to 2015.8.5
 2016-02-04 18:20:27 -07:00