Commit Graph

43611 Commits

Author SHA1 Message Date
Nitin Madhok
e492962996 Adding another unit test to check for zfs.create failure if the parent datasets do not exist 2014-12-19 14:12:12 -05:00
Nitin Madhok
e46f3f71ed Adding another unit test to check for zfs.create failure if the pool doesnt exist 2014-12-19 14:07:40 -05:00
Nitin Madhok
78ade421aa Adding another unit test to check for zfs.create failure if trailing slash in name is present 2014-12-19 13:58:53 -05:00
Nitin Madhok
d90a4ecf7f Adding another unit test to check for zfs.create failure if dataset name is missing 2014-12-19 13:46:33 -05:00
Nitin Madhok
fa5834b564 Change patches to all test functions 2014-12-19 13:38:42 -05:00
Nitin Madhok
aa570e3ceb Changing AssertEquals to AssertTrue and AssertFalse 2014-12-19 11:45:16 -05:00
Nitin Madhok
0b8bed6d94 Adding another unit test to check for zfs.create success 2014-12-19 11:04:19 -05:00
Nitin Madhok
2ed539ea61 Adding another unit test to check for zfs.exists failure 2014-12-19 10:36:28 -05:00
Nitin Madhok
5c8a81a166 Adding unit tests for zfs.exists 2014-12-19 10:29:33 -05:00
Thomas S Hatch
4194a22f07 Merge pull request #19097 from thatch45/fix_perms
Fix perms
2014-12-18 17:02:21 -07:00
Joseph Hall
dee41b9a59 Merge pull request #19108 from nlm/develop
edited_conf docstring fix
2014-12-18 14:47:29 -07:00
Nicolas Limage
225e28e47b edited_conf docstring fix 2014-12-18 22:42:18 +01: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
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
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
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
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
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
Dmitry Kuzmenko
aef46a5b0d Fixed highstate module (wrong merge) 2014-12-18 17:39:43 +03:00
Dmitry Kuzmenko
315aa8a7d0 Fixed mistypes in key.py: self.PRE -> self.PEND 2014-12-18 15:40:03 +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
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
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
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
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