valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,389 Commits 24 Branches 182 Tags 341 MiB
f92fd17d46
Commit Graph

38389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Fach
c9431955e8 fixed invalid changes data issue 2015-02-26 16:21:10 +00:00
Nicole Thomas
c3027966c4 Merge pull request #21063 from jond64/bp-16306 
Backport #16306 to 2014.7
 2015-02-26 09:20:09 -07:00
Robert Fach
23524ea337 fixed identation 2015-02-26 15:18:47 +00:00
Robert Fach
03ec03efd6 fixed issue where user option is internally transformed to username which is what /proc/mounts reports for cifs mounts 2015-02-26 14:55:39 +00:00
Robert Fach
f42cd1c48e added options auto, users to mount invisible options 2015-02-26 14:37:03 +00:00
Loren Gordon
fef427b7ff Fix file.replace regressions, fixes saltstack#20970 and saltstack#20603 
This commit reverts to the file.replace code from 2014.7.0, which fixes
saltstack#20970 and saltstack#20603. It then introduces an alternative
patch that fixes saltstack#18612 and doesn't require passing through the
file twice.

There is a small regression in backup behavior... If the pattern is not
found, and if dry run is False, and if `backup` is False, and if a
pre-existing file exists with extension `.bak`, then that backup file
will be overwritten. This backup behavior is a result of how `fileinput`
works. Fixing it requires either passing through the file twice (the
first time only to search for content and set a flag), or rewriting
`file.replace` so it doesn't use `fileinput`.
 2015-02-26 07:46:24 -05:00
Shane Hathaway
3c061ac526 Fix the 'test' mode of the 'network' state module. It hit false positives due to inconsistent newline handling. 2015-02-26 02:44:58 -06:00
Erik Johnson
ae5cad196c Add imp to windows freezer_includes 
Got an ImportError on this line when I was testing on Windows.

https://github.com/terminalmage/salt/blob/43e15d8/salt/loader.py#L624
 2015-02-26 00:23:26 -06:00
Seth House
70276a9881 Merge pull request #21052 from lorengordon/file-replace-convert-pattern-to-string 
Convert `pattern` to string, fixes saltstack#21051
 2015-02-25 19:58:34 -07:00
Thomas S Hatch
49cf39e807 Merge pull request #20854 from terminalmage/issue20785 
VCS fileserver backend fixes/optimizations
 2015-02-25 18:09:17 -07:00
Thomas S Hatch
87c6e0cbe9 Merge pull request #21023 from rallytime/bp-19303 
Backport #19303 to 2014.7
 2015-02-25 18:07:00 -07:00
Thomas S Hatch
1572b8059f Merge pull request #21047 from jfindlay/pub_args 
simplify yaml parsing for publish module
 2015-02-25 17:44:02 -07:00
Loren Gordon
3d5d594fbc Convert pattern to string, fixes saltstack#21051 2015-02-25 19:37:56 -05:00
Thomas S Hatch
c6ddfa26e0 Merge pull request #21034 from basepi/salt-ssh-salt-api-20418 
[2014.7] Fix for salt-ssh without command line parsers
 2015-02-25 16:13:03 -07:00
Thomas S Hatch
d5a98f3aab Merge pull request #21032 from rallytime/bp-21024 
Backport #21024 to 2014.7
 2015-02-25 16:12:16 -07:00
Erik Johnson
43e15d8e2f Support Chocolatey 0.9.9+ 
The upcoming release will require "--yes" to execute commands that
change the machine's state (install/remove packages, etc). Also, our old
version determination code won't work with it. This commit fixes both
issues.
 2015-02-25 17:09:39 -06:00
Justin Findlay
e2e59da5f7 simplify yaml parsing for publish module 
updates #20992
 2015-02-25 16:02:46 -07:00
jfindlay
9eaac2b63c Merge pull request #21028 from rallytime/fix-21012 
Use LooseVersion instead of StrictVersion to use an RC version of MongoDB
 2015-02-25 15:55:29 -07:00
Erik Johnson
d54a04d696 Catch FileserverConfigError exceptions on master startup 
This causes the master to fail to start when there are fileserver config
issues, leading people quicker to the log to investigate, where they
will find a meaningful error message. This should it much quicker and
easier for users to realize there are gitfs/hgfs/svnfs fileserver config
problems.

Fixes #21021.
 2015-02-25 15:32:37 -06:00
Erik Johnson
9b2c90c86f svnfs: Raise exceptions on invalid configuration 2015-02-25 15:30:00 -06:00
Erik Johnson
6f2410647f hg: Raise exceptions on invalid configuration 2015-02-25 15:29:19 -06:00
Erik Johnson
9ffdd40d8a gitfs: Raise exceptions on invalid configuration 2015-02-25 15:23:28 -06:00
rallytime
565f10959d Add transport key to mocked opts to fix batch unit tests 2015-02-25 13:51:25 -07:00
Erik Johnson
8bc7a4193d Fix missing space in log message 2015-02-25 14:35:46 -06:00
Colton Myers
1700d0c05b Fix for salt-ssh without command line parsers 2015-02-25 12:19:06 -07:00
Erik Johnson
6322d15fa7 Add FileserverConfigError exception class 2015-02-25 13:17:05 -06:00
rallytime
ea90e4e35f Pylint fix 2015-02-25 11:54:13 -07:00
Paul Tonelli
6ffffed8e0 use file.replace instead of file.sed 2015-02-25 11:53:51 -07:00
Paul Tonelli
4e338a0c86 fix set_locale when locale file does not exist (in RedHat family) 2015-02-25 11:53:51 -07:00
rallytime
aedc9115af Use LooseVersion instead of StrictVersion to use an RC version of MongoDB 
Fixes #21012
 2015-02-25 10:25:46 -07:00
jfindlay
92a71b719a Merge pull request #21022 from nitti/2014.7 
correctly count active devices when creating a mdadm array with spares
 2015-02-25 10:22:30 -07:00
Mike Place
90eb36eba6 Merge pull request #20992 from jfindlay/pub_args 
fix arg preparation for publish module
 2015-02-25 09:39:33 -07:00
Mike Place
009012f067 Merge pull request #21002 from rallytime/moar_digitalocean_tests 
Moar digitalocean tests
 2015-02-25 09:36:25 -07:00
Mike Place
011f8c4e72 Adjust batch test 2015-02-25 09:32:03 -07:00
Mike Place
bf2b8de840 Just use ckminions in batch mode. 
Refs #18358
 2015-02-25 09:32:03 -07:00
Mike Place
117d3356db Merge pull request #21013 from wt/2014.7_add_log_for_yaml_filter 
Add version to a deprecation log message.
 2015-02-25 09:14:05 -07:00
Tom Nitti
0753901cb5 correctly count raid devices when creating an array with spares 2015-02-25 09:13:04 -06:00
Warren Turkal
28b47c1064 Add version to a deprecation log message. 2015-02-24 22:56:38 -08:00
Erik Johnson
a2452aa611 gitfs: Add warning about ssh:// URLs (dulwich) 2015-02-24 22:37:30 -06:00
Erik Johnson
256786cc94 gitfs: Support ssh:// URLs for dulwich 2015-02-24 22:37:30 -06:00
Erik Johnson
852c29871f fix missing import 2015-02-24 22:37:30 -06:00
Erik Johnson
1a74097903 Fix CLI example for fileserver.clear_cache runner 2015-02-24 22:37:30 -06:00
Erik Johnson
a65302560c Lint fixes 2015-02-24 22:37:30 -06:00
Erik Johnson
e7a3142f1a Fix spurious error in master log 
When only GitPython is installed, and no gitfs_provider is set, an error
about pygit2 not being available is logged. This should not happen, as
gitfs should just select the first available out of pygit2, gitpython,
and dulwich.

This fixes #17945 by suppressing the error.
 2015-02-24 22:37:30 -06:00
Erik Johnson
d2c543cca9 Log success/failure in dealing with lockfiles in their actual functions 
Logging them separately in update() doesn't make much sense.
 2015-02-24 22:37:30 -06:00
Erik Johnson
7f968123a6 Add salt.fileserver.gitfs.lock() 
Also rewrite salt.fileserver.gitfs.clear_lock() to accept a repo conf
dict instead of a pattern, so that locking and unlocking in
salt.fileserver.gitfs.update() can use the same code as the fileserver
runner.
 2015-02-24 22:37:30 -06:00
Erik Johnson
2e07dc038c Add salt.fileserver.svnfs.lock() 
Also rewrite salt.fileserver.svnfs.clear_lock() to accept a repo conf
dict instead of a pattern, so that locking and unlocking in
salt.fileserver.svnfs.update() can use the same code as the fileserver
runner.
 2015-02-24 22:37:30 -06:00
Erik Johnson
db85cd43f7 Improve salt fileserver documentation 2015-02-24 22:37:30 -06:00
Erik Johnson
a183521f44 Add salt.runners.fileserver.lock() 2015-02-24 22:37:30 -06:00
Erik Johnson
d07e21f97b Add salt.runners.fileserver.{,empty_}dir_list 
This rounds out the runner support for the fileserver runner.
 2015-02-24 22:37:29 -06:00