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,857 Commits 24 Branches 182 Tags 341 MiB
e5fb81970d
Commit Graph

43857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
ad56bf84c9 Merge pull request #19049 from rupeshta/linux_lvm_unit_tests 
created unit test cases for linux_lvm module
 2014-12-18 09:34:36 -07:00
Thomas S Hatch
f25f92dd18 Merge pull request #19047 from eliasp/2014.7-modules.file.replace-test-coverage 
2014.7 file.replace integration test coverage
 2014-12-18 09:33:34 -07:00
Mike Place
e563d35af7 Merge pull request #19085 from DSRCompany/raet_presence_key_fix 
Raet presence key fix
 2014-12-18 09:06:04 -07:00
Joseph Hall
74bd7f08d8 Merge pull request #19079 from Lendar/fix-s3-put 
Fix PUT/DELETE in s3.query
 2014-12-18 08:47:15 -07:00
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
rdutch
299163960d Added remove feature functionality 
Added remove feature, so same state file can be used to install or remove features/roles
 2014-12-18 10:19:07 -05:00
Erik Johnson
984fd744e8 Fix regression in lxc.update_lxc_conf 
This regression snuck in after the 2014.7.0 release, in d447cead. Fixing
this ahead of the 2014.7.1 release.
 2014-12-18 09:15:23 -06:00
Nitin Madhok
d585771ff0 Adding ability to do a test run with test=True. #18966 2014-12-18 08:08:52 -07:00
Dmitry Kuzmenko
aef46a5b0d Fixed highstate module (wrong merge) 2014-12-18 17:39:43 +03:00
C. R. Oldham
8e184b372d Merge pull request #19082 from Lendar/fix-schedule-examples 
Fix states.schedule examples
 2014-12-18 07:13:48 -07:00
Dmitry Kuzmenko
315aa8a7d0 Fixed mistypes in key.py: self.PRE -> self.PEND 2014-12-18 15:40:03 +03:00
Lendar
14fa721256 Fix states.schedule examples 2014-12-18 14:24:17 +03:00
Lendar
0788cff5d6 Fix PUT/DELETE in s3.query 
Was broken in 8ed7c92 during move to requests.

- PUT now uploads data
- Fixes AttributeError
 2014-12-18 13:01:25 +03: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
Grischa Meyer
609f41084b check for None in ec2 tags (EC2 compatible endpoints) 2014-12-18 17:45:14 +11:00
Grischa Meyer
e471e37e43 fix ec2 cloud provider for endpoint URLs with paths 2014-12-18 17:31:30 +11:00
Rupesh Tare
a851d449f5 class name changed 2014-12-18 11:53:10 +05:30
Pedro Algarvio
2e9026395f Add file perms pylint plugin specific settings 2014-12-18 05:35:19 +00:00
Pedro Algarvio
6e39a1e678 Enable file permissions lint checker. 
This will allow us to confirm that no modules are added to salt with the
wrong file permissions. Default file permissions is 0644.
 2014-12-18 05:35:19 +00:00
Rupesh Tare
97b53fbcec Merge branch 'develop' into linux_lvm_unit_tests 2014-12-18 11:00:03 +05:30
Rupesh Tare
01ba8b6b46 pylint bug fixing 2014-12-18 10:59:01 +05:30
Elias Probst
e702c79817 Pylint. 2014-12-18 02:22:11 +01: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
Elias Probst
5a6811759f Fix tests for #18841. 2014-12-18 01:51:26 +01:00
Elias Probst
a2e52dd5fc Fix tests for #18841. 2014-12-18 01:51:08 +01:00
Elias Probst
e82c6ba7c0 Add missing line. 2014-12-18 01:50:39 +01:00
Elias Probst
24d6a6afd8 Simplify initial search. Determine 'backup' properly. 2014-12-18 01:48:53 +01:00
Joseph Hall
099ce9db46 Looks like we missed a couple of exitcodes 2014-12-17 17:19:54 -07:00
Mikael H. Møller
ae6ae3ea94 added support for rev branch when using deepth parameter 2014-12-17 15:57:11 -08:00
Ben Osman
1f104ba7d9 Add allow_symlink argument to allow enforcing real directories. 2014-12-17 23:41:27 +00: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
Mike Place
19ade3a6fb Route minion errors to master 
Conflicts:
	salt/cli/__init__.py
 2014-12-17 15:58:54 -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
Colton Myers
228b2b6cd4 Discard stderr for salt-ssh with tty 
Because we're using a tty, we only get a combined stdout and stderr. So
we throw away the stderr from our salt command and we don't worry about
the lack of an RSTR in the stderr on the master side
 2014-12-17 15:08:55 -07:00
Colton Myers
937b805ae6 Don't use -t -t for scp commands when tty enabled in salt-ssh 2014-12-17 15:08:17 -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