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,828 Commits 24 Branches 182 Tags 341 MiB
32f5f245ca
Commit Graph

43828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e98d225c47 Remove debugging 2014-12-18 12:03:32 -07:00
Mike Place
bf81871b2c Preserve a minion cache on a per-request basis to revoke_auth 2014-12-18 12:00:53 -07:00
Thomas S Hatch
2546c489f8 try out pylint disable for perms 2014-12-18 10:43:41 -07:00
Thomas S Hatch
6a9195e190 fix bad file perms 2014-12-18 10:42:25 -07:00
Thomas S Hatch
b8f4cc7021 more lint 2014-12-18 10:33:31 -07:00
Colton Myers
43df12b6cc Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/client/ssh/shell.py
	salt/modules/file.py
	tests/integration/states/file.py
 2014-12-18 10:32:19 -07:00
Colton Myers
75dc997ced Merge pull request #19095 from basepi/pylint-merge-forward 
Fix some mistakes from the merge forward
 2014-12-18 10:21:26 -07:00
Colton Myers
9edba95913 Revert bad merge forward of salt/utils/event.py 2014-12-18 10:18:26 -07:00
Thomas S Hatch
cc8705bcba lint 2014-12-18 10:15:58 -07:00
Thomas S Hatch
6afb8b64d6 Merge branch 'disk_unit_tests' of https://github.com/jayeshka/salt into jayeshka-disk_unit_tests 2014-12-18 10:11:01 -07:00
Thomas S Hatch
78e77a5a29 lint 2014-12-18 10:03:32 -07:00
Thomas S Hatch
ea4f42ffb4 Merge branch 'patch-2' of https://github.com/rdutch/salt into rdutch-patch-2 2014-12-18 10:01:29 -07:00
Thomas S Hatch
1a8a4d3bbf Merge pull request #19001 from mirath/feature/pip_pkgs 
Added support for a pkgs argument to the pip state
 2014-12-18 09:59:30 -07:00
Colton Myers
1ffabf902a Remove code that shouldn't have been merged forward to develop 2014-12-18 09:55:58 -07:00
Thomas S Hatch
e29b7be9f8 Merge pull request #19005 from cachedout/route_errors 
Route minion errors to master
 2014-12-18 09:51:41 -07:00
Thomas S Hatch
f69575b65d Merge pull request #19088 from terminalmage/fix-update_lxc_conf 
Fix regression in lxc.update_lxc_conf
 2014-12-18 09:48:46 -07:00
Thomas S Hatch
34def7d81e Merge pull request #19086 from rallytime/bp-19014 
Backport #19014 to 2014.7
 2014-12-18 09:48:09 -07:00
Thomas S Hatch
6dd8f40c7b Merge pull request #19073 from s0undt3ch/features/file-perms-lint-2014.7 
Enable file permissions lint checker
 2014-12-18 09:41:03 -07:00
Thomas S Hatch
fbdf49d3ac Merge pull request #19071 from mikaelhm/add-depth-to-git-latest 
added support for rev branch when using deepth parameter
 2014-12-18 09:39:45 -07:00
Thomas S Hatch
5f8d76bff9 Merge pull request #19069 from smoothify/allow_symlink 
Add allow_symlink argument to allow enforcing real directories.
 2014-12-18 09:37:48 -07:00
Thomas S Hatch
716e45646d Merge pull request #19065 from basepi/salt-ssh-tty-16847 
Fix salt-ssh with sudo and tty enabled
 2014-12-18 09:35:36 -07:00
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