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

38125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
c959deefc2 Fix traceback in salt.fileserver.hgfs.init() 
Older versions of hglib did not raise an exception when no refs were
found. This commit catches the exception, fixing a traceback that
prevents new remotes from ever being fetched for the first time.
 2015-02-24 22:37:29 -06:00
Erik Johnson
bd42dcb5b5 Add logging noting which remote is being fetched 2015-02-24 22:37:29 -06:00
Erik Johnson
f0c27d309c Use shorter version of salt-run command in warning 2015-02-24 22:37:29 -06:00
Erik Johnson
4dc92710bd Add salt.fileserver.svnfs.clear_lock() 2015-02-24 22:37:29 -06:00
Erik Johnson
7c3788dd54 Add salt.fileserver.hgfs.clear_lock() 2015-02-24 22:37:28 -06:00
Erik Johnson
15a9e8421d Allow "fs" versions of VCS backends to work as arguments to fileserver runner functions 
i.e. "gitfs" and "git" both work, "hgfs" and "hg", etc. This should help
reduce confusion.
 2015-02-24 22:37:28 -06:00
Erik Johnson
74a6737e58 fix broken salt.utils.is_fcntl_available 2015-02-24 22:37:28 -06:00
Erik Johnson
ce3680249c add fileserver.clear_lock runner 2015-02-24 22:37:28 -06:00
Erik Johnson
6de88fc819 Add function in Fileserver class to invoke fsb.clear_lock 2015-02-24 22:37:28 -06:00
Erik Johnson
19f52b07ef Add salt.fileserver.gitfs.clear_lock() 2015-02-24 22:37:28 -06:00
Erik Johnson
7c3bb8bf5a Revert file locking code from PR #20141 2015-02-24 22:37:28 -06:00
Erik Johnson
61cfed60a1 Add example of clearing gitfs cache pre-2015.2.0 2015-02-24 22:37:28 -06:00
Erik Johnson
5bb28b6969 Add note about dulwich gitfs cache incompatibility 2015-02-24 22:37:28 -06:00
Erik Johnson
96d4151ecd runners.fileserver.clear_cache: display success and errors separately 2015-02-24 22:37:28 -06:00
Erik Johnson
259c498d04 fileserver.clear_cache: return success and errors separately 2015-02-24 22:37:28 -06:00
Erik Johnson
8a3f9eae4e svnfs.clear_cache: return errors instead of ignoring 2015-02-24 22:37:28 -06:00
Erik Johnson
cad06a94fa hgfs.clear_cache: return errors instead of ignoring 2015-02-24 22:37:28 -06:00
Erik Johnson
7dbb5a5008 gitfs.clear_cache: return errors instead of ignoring 2015-02-24 22:37:28 -06:00
Erik Johnson
fc4f4e397b Add fileserver.clear_cache runner 2015-02-24 22:37:28 -06:00
Erik Johnson
4a6c538e2b Add function in Fileserver class to invoke fsb.clear_cache 2015-02-24 22:37:27 -06:00
Erik Johnson
154af97e69 Add salt.fileserver.svnfs.clear_cache() 
Also rename purge_cache() to more accurately describe what the function
does.
 2015-02-24 22:37:27 -06:00
Erik Johnson
601a589f7b Add salt.fileserver.hgfs.clear_cache() 
Also rename purge_cache() to more accurately describe what the function
does.
 2015-02-24 22:37:27 -06:00
Erik Johnson
64f6efa3d5 Add salt.fileserver.gitfs.clear_cache() 
Also rename purge_cache() to more accurately describe what the function
does.
 2015-02-24 22:37:27 -06:00
Erik Johnson
32db86c3cd gitfs: fix new branch detection (pygit2) 
This fixes the same branch/tag detection issues resolved for GitPython
in the previous commit. Additionally, it refines the work done to fix
this issue in GitPython.
 2015-02-24 22:37:27 -06:00
Erik Johnson
129851ed0b gitfs: fix new branch detection (GitPython) 
The existing method of change detection only caught changes to existing
branches. New branches and deleted branches weren't detected as changes.

It turns out that the return value of a fetch with no changes is an
empty list, so simply checking if the return value is non-empty catches
instances where there is a new branch, as well as instances where an
existing branch was updated.

Additionally, the existence of stale refs after a fetch is now used to
determine if a local branch no longer exists on the remote repository.
These stale refs are now deleted to keep the local checkout clean.
 2015-02-24 22:37:27 -06:00
jfindlay
5a5f38a8a7 Merge pull request #20984 from rallytime/fix-18725 
Switch modprobe -r to rmmod in kmod.remove
 2015-02-24 15:32:21 -07:00
jfindlay
8a0348458e Merge pull request #20990 from joehoyle/fix-typo-s3fs-backport 
Backport fix #20987
 2015-02-24 15:29:21 -07:00
Colton Myers
349ae2bac7 Merge pull request #20983 from basepi/backport_20304 
[2014.7] Backport #20304 to catch msgpack errors in cmd.run
 2015-02-24 14:23:14 -07:00
Joe Hoyle
f0ba7ee962 Fixed typo, doh! 2015-02-24 16:08:04 -05:00
rallytime
931f555e4d Switch modprobe -r to rmmod in kmod.remove 
Fixes #18725
 2015-02-24 12:12:42 -07:00
Colton Myers
d28908408a Backport #20304 to catch msgpack errors in cmd.run in 2014.7 2015-02-24 12:11:08 -07:00
Nicole Thomas
00e3dc323f Merge pull request #20957 from jfindlay/cmd_tests 
adding cmd.run integration tests
 2015-02-23 20:04:03 -07:00
jfindlay
2cbf8e9282 Merge pull request #20937 from wt/2014.7_add_log_for_yaml_filter 
Log when the yaml filter outputs trailing ellipsis.
 2015-02-23 19:14:42 -07:00
jfindlay
34f83ee2a4 Merge pull request #20954 from rallytime/bp-20891 
Backport #20891 to 2014.7
 2015-02-23 19:02:00 -07:00
jfindlay
1fa8c7aab7 Merge pull request #20953 from rallytime/bp-20888 
Backport #20888 to 2014.7
 2015-02-23 17:01:01 -07:00
jfindlay
dfef980918 Merge pull request #20951 from rallytime/bp-20837 
Backport #20837 to 2014.7
 2015-02-23 16:44:08 -07:00
Justin Findlay
5ab5380094 adding cmd.run integration tests 2015-02-23 16:35:07 -07:00
Justin Findlay
213ef3d061 fix lint 2015-02-23 16:04:32 -07:00
Jay McConnell
b0a4e48ec4 Fix disk.usage for Synology OS 
relates to issue <a href="https://github.com/saltstack/salt/issues/20790">#20790</a>
 2015-02-23 16:04:32 -07:00
Justin Findlay
e9ff8ffd19 fix lint 2015-02-23 15:58:34 -07:00
Joe Hoyle
86029e7369 Trim the env base off the dest file path in the s3fs fileserver 2015-02-23 15:58:34 -07:00
Viktor Krivak
5d1bc21901 Fix multi comps and multi dist bugs 
Fix line full_comp_list.union(set(kwargs['comps'])) which actually don't do anything, because union don't modify source set. Looks like typo...
It is possible to have multiple 'dist' in single repository, i.e. wheezy and wheezy-backports . So in consolidate repos, use dist also as a key.
 2015-02-23 15:55:00 -07:00
Warren Turkal
f037dcf1d5 Log when the yaml filter outputs trailing ellipsis. 2015-02-23 11:31:16 -08:00
jfindlay
55e7927077 Merge pull request #20922 from bbinet/2014.7_fix20921 
2014.7: fix issue 20921
 2015-02-23 08:35:02 -07:00
Robin Björklin
c0f9b9dd8d Fixed problem with tags occuring twice with docker.pulled 2015-02-23 11:37:24 +01:00
Sebastien Estienne
c53ce9d0d9 Docker: improve tags support 
Conflicts:
	salt/states/dockerio.py
 2015-02-23 11:37:03 +01:00
Mike Place
081867c7d4 Merge pull request #20895 from bechtoldt/2014.7 
fix wrong dict access in smtp returner in 2014.7
 2015-02-21 07:02:47 -07:00
Arnold Bechtoldt
8ee52d65e1 fix wrong dict access in smtp returner, that is already fixed in 2015.2 
and later
 2015-02-21 11:38:32 +01:00
Thomas S Hatch
964e77e504 Merge pull request #20880 from thatch45/systemd_listdir 
fix bug from systems without any legacy init scripts
 2015-02-20 17:47:34 -07:00
Thomas S Hatch
9401b24b8c Merge pull request #20881 from thatch45/listen_req 
Remove requisites from listen post calls
 2015-02-20 17:41:17 -07:00