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
49,059 Commits 24 Branches 182 Tags 341 MiB
81bed62d16
Commit Graph

49059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
81bed62d16 Merge pull request #25406 from alprs/fix-apt_version_cmp_types 
Force arguments to aptpkg.version_cmp into strings
 2015-07-14 10:15:41 -06:00
Mike Place
cd9ea63ff2 Merge pull request #25408 from rallytime/bp-25399 
Back-port #25399 to 2015.5
 2015-07-14 10:09:06 -06:00
Mike Place
ef9f6b0ce0 Merge pull request #25240 from tankywoo/fix-files-os-walk-multiple-times 
file make os.walk only be called one
 2015-07-14 10:04:49 -06:00
Jarpy
da9c0eb673 Typo in client_acl ref doc. 2015-07-14 08:54:32 -06:00
Jarpy
50e0baf270 Demonstrate per-minion client_acl. 
The client_acl system supports setting restrictions based on minion name.
Update the Client ACL System reference page to reflect this.
 2015-07-14 08:54:32 -06:00
Andreas Lutro
d56efd1341 force arguments to apt_pkg.version_compare into strings 
very commonly a float will be passed to the function due to the way module
execution and yaml parsing works. this will throw a TypeError, which will
cause the function to move on to the shell fallback.
 2015-07-14 15:52:07 +02:00
Tanky Woo
8044def1c0 file make os.walk only be called one 
if a single check have multiple os.walk, such as in _check_directory
function, when there are many files in directory, it will use many time
to generate keep files, if there are some new files between
_gen_keep_files and _check_changes, it will say these files are to be
removed, but in actually, these files in require directory and no need
to removed.
 2015-07-14 21:37:01 +08:00
Justin Findlay
d02f388b08 Merge pull request #25395 from rallytime/bp-25389 
Back-port #25389 to 2015.5
 2015-07-13 21:26:34 -06:00
Justin Findlay
008e3295c6 Merge pull request #25392 from rallytime/bp-25256 
Back-port #25256 to 2015.5
 2015-07-13 21:25:13 -06:00
Justin Findlay
3f278963ae Merge pull request #25398 from twangboy/fix_date 
Fix date
 2015-07-13 21:21:17 -06:00
Justin Findlay
978d9f7117 Merge pull request #25397 from GideonRed/2015.5 
Introduce standard error output when cli exits with non-zero status
 2015-07-13 21:20:24 -06:00
Robert James Hernandez
a086e5ad35 Adding entropy note 2015-07-13 16:30:17 -06:00
Jon Eisen
6b2da4d582 Dont assume source_hash exists 
When using file.managed with a source of `file://` and no `source_hash`, this code block can be entered which assumes `source_hash` exists. Here, I add `source_hash` to the `if` statement as a temporary fix. Ideally, we could check for a cached templated file without the need for `source_hash`.
 2015-07-13 16:19:12 -06:00
Mike Place
09442abbde Merge pull request #25386 from cachedout/lint_25383 
Lint #25383
 2015-07-13 15:01:10 -06:00
Mike Place
7694299170 Lint #25383 2015-07-13 15:00:24 -06:00
Mike Place
47bcc61f55 Merge pull request #25383 from jahamn/Fix-file.managed_not_handling_dead_symlinks 
Fix manage_file function in salt/modules/file.py to handle broken sym…
 2015-07-13 14:58:23 -06:00
Mike Place
c9fe10e7aa Merge pull request #25369 from alprs/fix-apt_version_cmp 
Fix aptpkg.version_cmp
 2015-07-13 14:18:45 -06:00
Mike Place
beb0238392 Merge pull request #25379 from jfindlay/check_wd 
check for cwd before getting it
 2015-07-13 13:50:27 -06:00
Jason Hamner
ab17aa160e Fix manage_file function in salt/modules/file.py to handle broken symlinks 
Fixes #24444 - file.managed does not handle dead symlinks
 2015-07-13 13:42:34 -06:00
Justin Findlay
6e4547ff38 check for cwd before getting it 
Fixes #25337.
 2015-07-13 12:32:55 -06:00
twangboy
52824f9602 Added /V1 /Z to remove scheduled task after run 2015-07-13 11:47:46 -06:00
twangboy
a055cca79f Changed date of scheduled task to work in other locales 2015-07-13 11:42:28 -06:00
Mike Place
274622ad9b Merge pull request #25334 from jfindlay/fix_zyp 
return all cmd info back to zypper fcn
 2015-07-13 11:03:29 -06:00
Mike Place
71859c6593 Merge pull request #25339 from jfindlay/orch_doc 
update orchestration docs
 2015-07-13 10:04:25 -06:00
Mike Place
90a1ca02a3 Merge pull request #25358 from dkiser/22241_pillar_merge_lists 
Deep merge of pillar lists
 2015-07-13 09:51:01 -06:00
jacobhammons
66c619fd71 Merge pull request #25346 from bechtoldt/issue25281 
set correct indention in states/requisites.rst (docs), fixes #25281
 2015-07-13 09:34:45 -06:00
Andreas Lutro
6391b15b3e fix aptpkg.version_cmp 2015-07-13 16:09:16 +02:00
Gideon Redelinghuys
ea7ab27f31 Introduce standard error output when cli exits with non-zero status 2015-07-13 04:52:32 -07:00
Pedro Algarvio
b122ed931d Merge pull request #25336 from terminalmage/fix-init-grain 
Don't try to read init binary if it wasn't found
 2015-07-13 10:45:30 +01:00
Justin Findlay
1805bafc89 Merge pull request #25350 from davidjb/patch-4 
Fix documentation for file.blockreplace
 2015-07-12 21:41:19 -06:00
Domingo Kiser
d030e289b3 Deep merge of pillar lists 2015-07-12 12:36:29 -07:00
David Beitey
e13a9fd74e Fix documentation for file.blockreplace 
Change marker_stop to marker_end & add formatting
 2015-07-12 10:59:16 +10:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
Justin Findlay
0447808d95 clarify, motivate orchestration docs 2015-07-10 17:03:27 -06:00
Erik Johnson
f473918a53 Don't try to read init binary if it wasn't found 
This fixes an edge case where init_bin is None in certain environments
(such as the Fedora Buildsystem).
 2015-07-10 16:27:55 -05:00
Justin Findlay
c1e633903e return all cmd info back to zypper fcn 
Fixes #25320.
 2015-07-10 13:58:19 -06:00
Justin Findlay
b0196fccb7 Merge pull request #25326 from rallytime/bp-20972 
Back-port #20972 to 2015.5
 2015-07-10 12:49:44 -06:00
Justin Findlay
28450d124e Merge pull request #25327 from rallytime/bp-25290 
Back-port #25290 to 2015.5
 2015-07-10 12:49:37 -06:00
Justin Findlay
8f666a24f3 Merge pull request #25328 from rallytime/bp-25309 
Back-port #25309 to 2015.5
 2015-07-10 11:22:59 -06:00
jacobhammons
0a33a1d8bb Merge pull request #25322 from jacobhammons/release-2015.5.3 
version change to 2015.5.3
 2015-07-10 10:11:24 -06:00
David Beitey
44d44ec574 Format /etc/locale.gen correctly on gen_locale 
Prior to this change, the ``file.replace`` call matches an end-of-line character, which changes a file from:
```
...
# en_US.UTF-8 UTF-8
# en_ZA ISO-8859-1
...
```
to
```
...
en_US.UTF-8 UTF-8# en_ZA ISO-8859-1
...
``` 
which is incorrectly formatted -- the newline char being removed means the whole section after the whitespace is considered the charset.  See http://www.man-online.org/page/5-locale.gen/.

This may fix #24827.
 2015-07-10 10:02:30 -06:00
René Jochum
20032c55f3 Simple fix for locale.present on Ubuntu. 
Signed-off-by: René Jochum <rene@jochums.at>
 2015-07-10 10:00:49 -06:00
Johannes Ebke
51c941f59d Also fix cleanup of interfaces when using AssociatePublicIpAddress in #19288 2015-07-10 09:58:08 -06:00
Jacob Hammons
19f88920fa version change to 2015.5.3 2015-07-10 09:43:15 -06:00
Justin Findlay
2f0f59b6cb Merge pull request #25308 from jacksontj/2015.5 
Make clear commands trace level logging
 2015-07-10 08:20:06 -06:00
Thomas Jackson
60fc770ba2 Make clear commands trace level logging 2015-07-09 19:10:39 -07:00
Thomas S Hatch
9b6646d578 Merge pull request #25269 from jfindlay/tomcat 
Extract tomcat war version
 2015-07-09 19:28:21 -06:00
Thomas S Hatch
0f82ac3e30 Merge pull request #25238 from DSRCompany/pillarenv_backport_2015.5 
Pillarenv backport 2015.5
 2015-07-09 19:25:07 -06:00
C. R. Oldham
219d4cad9c Merge pull request #25299 from twangboy/fix_13943 
Added -NonInteractive so powershell doesn't hang waiting for input
 2015-07-09 15:00:16 -06:00
jacobhammons
1c43892a80 Merge pull request #25301 from jacobhammons/doc-bugs 
bug fix for module function display in help
 2015-07-09 14:46:34 -06:00