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
56,175 Commits 24 Branches 182 Tags 341 MiB
299875df3d
Commit Graph

56175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
299875df3d Move #25642 to 2015.8 
Closes #25899
 2015-08-03 15:50:21 -06:00
Colton Myers
7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-03 14:30:07 -06:00
Thomas S Hatch
10813cadef Merge pull request #25956 from alprs/fix-cron_user 
Fix user argument to cron functions
 2015-08-03 13:40:16 -06:00
Thomas S Hatch
aeb3b4edaf Merge pull request #25946 from sjorge/esky-decorator-fix 
Fix for salt.utils.decorators under esky
 2015-08-03 13:39:32 -06:00
Colton Myers
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -06:00
Colton Myers
876af79897 Py3 compat 2015-08-03 10:53:05 -06:00
Colton Myers
579ba19c1d Fix lint 2015-08-03 10:52:16 -06:00
Mike Place
0bffcff5e1 Merge pull request #25957 from alprs/fix-file_managed_checkcmd_remove 
Remove temporary file after file.managed with checkcmd
 2015-08-03 10:51:03 -06:00
Nicole Thomas
1ba7e8ebcf Merge pull request #25874 from rallytime/bp-25668 
Back-port #25668 to 2015.8
 2015-08-03 10:40:42 -06:00
Mike Place
15b14b761f Merge pull request #25929 from sjorge/fix-pkgin-module 
salt.module.pkgin's __virtual__() should not return None if pkg_info is not present
 2015-08-03 09:34:15 -06:00
Andreas Lutro
60c250af37 file.managed: tmp_filename needs to always be defined 2015-08-03 16:56:28 +02:00
Andreas Lutro
0b10cead06 delete tmp file when file.managed has check_cmd arg 2015-08-03 16:51:57 +02:00
Andreas Lutro
b3c1fa53b9 fix user argument to cron functions 2015-08-03 09:38:54 +02:00
Justin Findlay
c636f7fe9c Merge pull request #25952 from garethgreenaway/2015_8_event_fire_failed_log_why 
Log when event.fire and event.fire_master fail 2015.8
 2015-08-02 18:20:19 -06:00
Gareth J. Greenaway
e4ac757f0b If we're unable to fire an event, log the cause so we know what happened 2015-08-02 11:15:26 -07:00
Justin Findlay
cbd539fcf6 Merge pull request #25944 from sjorge/smartos-libcrypto-nonesky-fix 
Smartos libcrypto nonesky fix
 2015-08-01 12:14:43 -06:00
Jorge Schrauwen
bebdc26616 inspect.getmodule fails without .py, using frame and f_global instead. 2015-08-01 12:05:28 +00:00
Jorge Schrauwen
77239fa1ae fix for loading libcrypto on non esky smartos 2015-08-01 10:57:45 +00:00
Jorge Schrauwen
59fcdf985f Merge pull request #2 from saltstack/2015.8 
Sync 2015.8 with upstream
 2015-08-01 01:37:14 +02:00
Justin Findlay
76d08d93f4 Merge pull request #25906 from saltstack/dgm_pkgbuild 
Cherry-pick of pkgbuild changes from develop branch
 2015-07-31 16:00:29 -06:00
rallytime
a53d0e119f Pylint 2015-07-31 15:11:10 -06:00
Joseph Hall
8e17d15755 Trace log whether or not data is a dict 2015-07-31 15:08:12 -06:00
Mike Place
026e5f926d Fix error introduced in #25668 2015-07-31 15:07:48 -06:00
Thomas S Hatch
12d6aa31e5 Merge pull request #25925 from sjorge/smartos-esky-fixes 
Create default log location in smartos esky buildscript
 2015-07-31 14:21:05 -06:00
Mike Place
fe35490447 Merge pull request #25928 from cachedout/issue_25813 
Fix stacktrace for non-existant states
 2015-07-31 13:59:00 -06:00
Jorge Schrauwen
33e0f28f29 try to pass pylint, catch only the correct exception 2015-07-31 19:31:47 +00:00
Mike Place
2276d43c94 Merge pull request #25922 from jacksontj/2015.8 
Correct max_wait -> max_auth_wait in MultiMinion
 2015-07-31 11:17:55 -06:00
Justin Findlay
6109806fd0 Merge pull request #25907 from rallytime/bp-25892-dot-eight 
Back-port #25892 to 2015.8
 2015-07-31 11:11:43 -06:00
Mike Place
ce034e28f9 Fix stacktrace for non-existant states 
Closes #25813
 2015-07-31 11:09:26 -06:00
Jorge Schrauwen
84e75831c0 pkgin module should not throw exception in _check_pkgin incase pkg_info is missing 2015-07-31 17:08:40 +00:00
Jorge Schrauwen
ebb63f15a6 create log directory for smartos esky package 2015-07-31 16:34:02 +00:00
Jorge Schrauwen
f4cdc70a55 Merge pull request #1 from saltstack/2015.8 
Sync 2015.8 with upstream
 2015-07-31 18:20:14 +02:00
Thomas Jackson
833950fb1e Correct max_wait -> max_auth_wait in MultiMinion 
Fixes #25795
 2015-07-31 09:03:38 -07:00
Pedro Algarvio
d30a99a117 Merge pull request #25910 from terminalmage/issue25776 
Pass osarch to check_32()
 2015-07-31 13:12:36 +01:00
Erik Johnson
ae473ce017 Pass osarch to check_32() 
This prevents a bunch of unnecessary calls to ``rpm --eval``.

Fixes #25776.
 2015-07-31 01:15:57 -05:00
Mike Place
cf6b17984d Merge pull request #25849 from basepi/gpg.renderer.25774 
Repress template error for GPG renderer (can't seek an OrderedDict)
 2015-07-30 17:25:06 -06:00
TheBigBear
0d33bae104 Update 7-zip msi un-installer instructions 
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
 2015-07-30 17:24:04 -06:00
David Murphy
897bab4d4f Fixes for pkgbuild, added support for dependencies building package 
(cherry picked from commit 1c86e0110f)
 2015-07-30 17:20:16 -06:00
David Murphy
b6c0da3e04 Fixed pylint errors 
(cherry picked from commit 142b50b900)
 2015-07-30 17:20:03 -06:00
David Murphy
aeacffd6d8 Added Debian execution module debbuild.py and rpmbuild.py fix 
Added build execution module for Debian 8 (jessie) to plug into
the pkgbuild module.  Also fixed rpmbuild.py to create .rpmmacros
file in builder's home directory.

(cherry picked from commit 8ba66fa257)
 2015-07-30 17:19:47 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Mike Place
32019c5f77 Merge pull request #25868 from rallytime/bp-25404 
Back-port #25404 to 2015.8
 2015-07-30 16:09:42 -06:00
Mike Place
c011511b1c Merge pull request #25896 from cachedout/lint_25876 
Lint
 2015-07-30 15:39:50 -06:00
Mike Place
1dc128b2f2 Lint 2015-07-30 15:39:34 -06:00
Mike Place
1b3ea19a9e Merge pull request #25876 from jacksontj/2015.8 
Fixes for 2015.8
 2015-07-30 15:38:12 -06:00
Justin Findlay
af2326af68 Merge pull request #25885 from t0rrant/patch-3 
Update Debian changelog
 2015-07-30 14:05:59 -06:00
Thomas S Hatch
6ce0b3e5b8 Merge pull request #25875 from rallytime/bp-25862 
Back-port #25862 to 2015.5
 2015-07-30 11:34:02 -06:00
Thomas S Hatch
66dcc5525e Merge pull request #25873 from rallytime/bp-25855 
Back-port #25855 to 2015.5
 2015-07-30 11:33:54 -06:00
Thomas S Hatch
bf8bd38da7 Merge pull request #25871 from rallytime/bp-25829 
Back-port #25829 to 2015.5
 2015-07-30 11:33:42 -06:00
Thomas S Hatch
f26310ff0b Merge pull request #25869 from rallytime/bp-25788 
Back-port #25788 to 2015.5
 2015-07-30 11:33:33 -06:00