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
43,573 Commits 24 Branches 182 Tags 341 MiB
055fa88f91
Commit Graph

43573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
055fa88f91 Merge pull request #19075 from aletourneau/alex.18475 
__render_script now renders {{minion}} when called form os_script (Fixes #18475)
 2014-12-18 08:41:00 -07:00
Alexandre Letourneau
af50a8df4b __render_script now renders the {{minion}} jinja2 variable correctly when called from os_script (Fixes #18475) 2014-12-18 01:59:12 -05:00
Mike Place
e7d95eed5a Merge pull request #19072 from techhat/exitcodes 
Looks like we missed a couple of exitcodes
 2014-12-17 18:12:12 -07:00
Joseph Hall
099ce9db46 Looks like we missed a couple of exitcodes 2014-12-17 17:19:54 -07:00
Colton Myers
ac0814d0e4 Merge pull request #19070 from basepi/fix_salt_ssh 
Fix a couple __version__ issues from the cli refactor
 2014-12-17 16:38:15 -07:00
Colton Myers
a893c62a35 Fix another __version__ 2014-12-17 16:37:00 -07:00
Colton Myers
8f2edbf96b Fix __version__ issue 2014-12-17 16:35:47 -07:00
Joseph Hall
634e3a3671 Merge pull request #19068 from cachedout/fix_cloud_cli 
Fix #19063
 2014-12-17 16:19:17 -07:00
Mike Place
36c165869c Fix #19063 2014-12-17 16:07:32 -07:00
Colton Myers
239927a2dc Merge pull request #19067 from basepi/publish.runner_lint 
Fix lint for #19034
 2014-12-17 15:47:09 -07:00
Colton Myers
7c4df7ad84 Remove extra line at end of file 2014-12-17 15:45:59 -07:00
Thomas S Hatch
e3af5c48da Merge pull request #19034 from basepi/salt-ssh-publish.runner 
Add publish.runner wrapper function for salt-ssh
 2014-12-17 15:22:07 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/yumpkg.py
 2014-12-17 15:00:26 -07:00
Thomas S Hatch
ca1d2fa17a Merge pull request #19062 from terminalmage/issue19055 
Fix traceback for non-string values in lxc config files
 2014-12-17 14:58:58 -07:00
Thomas S Hatch
efb087df09 Merge pull request #19051 from nmadhok/fix-module-mdadm-create 
Fixing salt.modules.mdadm.create and correcting incorrect code.
 2014-12-17 14:56:18 -07:00
Thomas S Hatch
c6b293c5d5 Merge pull request #19046 from mscherer/add_shared_options_git 
Add a option 'shared' for the type of git repository to create
 2014-12-17 14:54:48 -07:00
Thomas S Hatch
6dd3c6e0a1 Merge pull request #19042 from JaseFace/aptpkg-uninstall-env-vars 
The aptpkg uninstall operation needs to inherit DPKG_ENV_VARS set above as install and upgrade currently do.
 2014-12-17 14:53:27 -07:00
Thomas S Hatch
c362592044 Merge pull request #19040 from whiteinge/salt-log-granular-example 
Updates to the logging docs in the example conf files
 2014-12-17 14:52:35 -07:00
Thomas S Hatch
2e28c3868a Merge pull request #19038 from mikaelhm/add-depth-to-git-latest 
An attempt to solve #16920 - added an optional depth parameter to salt.states.git.latest.
 2014-12-17 14:51:15 -07:00
Thomas S Hatch
5af06f26ee Merge pull request #19037 from jacksontj/develop 
Misc. eauth cleanup
 2014-12-17 14:50:19 -07:00
Thomas S Hatch
45365c095e Merge pull request #19029 from basepi/merge-forward 
Merge forward from 2014.7 to develop
 2014-12-17 14:48:01 -07:00
Thomas S Hatch
0fea74d51c Merge pull request #19025 from gravieinc/develop 
Fix for #18994
 2014-12-17 14:44:58 -07:00
Thomas S Hatch
d13d8b37b1 Merge pull request #19017 from rupeshta/at_unit_tests 
At unit tests
 2014-12-17 14:44:04 -07:00
Thomas S Hatch
ea28266b35 Merge pull request #19014 from nmadhok/fix-state-file-serialize 
Adding ability to do a test run with test=True.
 2014-12-17 14:42:35 -07:00
Thomas S Hatch
60f1e368bc Merge pull request #19008 from juiceinc/bugfix/tomcat-pillar 
Backwards compatibility for Tomcat module Pillar configuration
 2014-12-17 14:41:52 -07:00
Thomas S Hatch
a261e5bb31 Merge pull request #19004 from jacksontj/2014.7 
Fix for new threaded reactor
 2014-12-17 14:39:57 -07:00
Thomas S Hatch
b9d5b22559 Merge pull request #19002 from steverweber/network_wol 
include wol in network module
 2014-12-17 14:39:44 -07:00
Thomas S Hatch
c2c9e56b82 Merge pull request #18931 from cachedout/cli_refactor 
Refactor the entire CLI out of __init__
 2014-12-17 14:37:13 -07:00
Thomas S Hatch
6263382858 Merge pull request #18918 from cachedout/salt_cli_retcode 
Make salt cli return a non-zero error code if an error occurred
 2014-12-17 14:36:51 -07:00
Pedro Algarvio
6d27990c58 Merge pull request #19060 from techhat/impacket1 
Switch from smbclient to impacket
 2014-12-17 19:48:22 +00:00
Nitin Madhok
4cb2fd604c Refactor mdadm tests 2014-12-17 14:27:51 -05:00
Joseph Hall
b347e7706b Merge pull request #19059 from rallytime/docs_fix 
Correct master_sign_key_name reference
 2014-12-17 12:15:56 -07:00
Erik Johnson
721699d2bb Fix traceback for non-string values in lxc config files 
Resolves #19055.
 2014-12-17 13:05:48 -06:00
Nitin Madhok
c7eee6385b Forgot to end with quotes 2014-12-17 13:48:57 -05:00
Nitin Madhok
502b340553 Fixing unit tests for mdadm 2014-12-17 13:46:34 -05:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07:00
Joseph Hall
0154515873 Switch from smbclient to impacket 2014-12-17 11:40:26 -07:00
rallytime
926c486587 Correct master_sign_key_name reference 
Fixes #19053
 2014-12-17 11:32:23 -07:00
C. R. Oldham
93f76faaf6 Merge pull request #19045 from techhat/smbutil 
Adding initial utils lib for SMB
 2014-12-17 09:46:05 -07:00
Michael Scherer
1b2120b128 Add a option 'shared' for the type of git repository to create 
--shared is used to specify the permission of the
git repository.
 2014-12-17 17:27:22 +01:00
Joseph Hall
85fc273521 Linting 2014-12-17 08:59:26 -07:00
Joseph Hall
5b30c15cf7 Wrap impacket.smbconnection.putFile() 2014-12-17 08:36:05 -07:00
Nitin Madhok
48c5b32b81 Fixing salt.modules.mdadm.create and correcting incorrect code. Fixes #18991 2014-12-17 09:41:36 -05:00
Steve Weber
e7acf3a399 Update network.py 
fix lint
 2014-12-17 09:10:37 -05:00
Joseph Hall
efa011dbaa Adding initial utils lib for SMB 2014-12-16 21:00:35 -07:00
Jason Wolfe
317ff52631 The uninstall operation needs to inherit DPKG_ENV_VARS set above as install and upgrade currently do. Without this packages that prompt on removal cause that state to hang. resolvconf in particular prompts you with a warning about rebooting your system after removal. 2014-12-16 18:39:10 -07:00
Seth House
7ce1becf34 Added note about using log_level_logfile with log_granular_levels 2014-12-16 18:18:21 -07:00
Seth House
90edd2185b Removed trailing comma from log_granular_levels example; is invalid YAML 
Thanks to F. Langelier for the report.
 2014-12-16 18:13:07 -07:00
Mike Place
71bba6c676 Merge pull request #19039 from cachedout/progess_docs 
Add docs to progress outputter
 2014-12-16 17:37:47 -07:00
Thomas Jackson
82a42482de Cleanup "rights" function 
Since a success followed by a failure is still a success, there is no reason to check the rest

In addition, consolidating the logic to remove the local "good" since it isn't needed
 2014-12-16 16:37:12 -08:00