Commit Graph

37165 Commits

Author SHA1 Message Date
C. R. Oldham
8e691d7f32 Fix lint 2014-12-10 16:43:42 -07:00
C. R. Oldham
dfdbdb0a26 Add support for sockstat on FreeBSD as an alternative to lsof 2014-12-10 15:52:02 -07:00
Thomas S Hatch
1e77fc9b88 Merge pull request #18869 from wuxxin/2014.7
change pointtopoint to pointopoint also in template (contributes to #18331 )
2014-12-10 10:20:02 -07:00
Thomas S Hatch
fb1577e893 Merge pull request #18865 from jfindlay/venv_python
allow lookup of python on system path fix: #18852
2014-12-10 10:19:38 -07:00
Thomas S Hatch
6fe4f9a9e1 Merge pull request #18864 from techhat/issue18862
Run disk.inodeusage in posix mode
2014-12-10 10:19:10 -07:00
Justin Findlay
5f2d175eac update venv no python msg accordingly 2014-12-10 09:35:31 -07:00
wuxxin
05cf77b797 change pointtopoint to pointopoint also in template (contributes to #18331 ) 2014-12-10 00:50:10 +01:00
Joseph Hall
15f1fde49c Run disk.inodeusage in posix mode 2014-12-09 16:10:41 -07:00
Justin Findlay
058c0316b6 allow lookup of python on system path fix: #18852
fixes #18852
2014-12-09 15:52:50 -07:00
Thomas S Hatch
da14f0f8d7 Merge pull request #18825 from lyft/backport-grain-masterless-nosync
Do not sync grains in grains.setval when using local mode
2014-12-09 14:46:20 -07:00
Thomas S Hatch
da14f3218c Merge pull request #18821 from s0undt3ch/2014.7
Remove deprecated pylint options
2014-12-09 14:42:27 -07:00
Thomas S Hatch
5a7f26c994 Merge pull request #18814 from eliasp/2014.7-eselect-improvements
2014.7 eselect improvements
2014-12-09 14:40:03 -07:00
Thomas S Hatch
7993f5c826 Merge pull request #18812 from cro/proxy_logic_fix
Fix logic error introduced sometime in the past 6 months that prevented ...
2014-12-09 14:39:16 -07:00
Thomas S Hatch
14459bcec7 Merge pull request #18859 from saltstack/revert-18792-issue17963
Revert "Fix jinja search path for local file_client"
2014-12-09 14:34:50 -07:00
Thomas S Hatch
1e71344a98 Revert "Fix jinja search path for local file_client" 2014-12-09 14:34:45 -07:00
Thomas S Hatch
e14d524b53 Merge pull request #18792 from terminalmage/issue17963
Fix jinja search path for local file_client
2014-12-09 14:32:24 -07:00
Thomas S Hatch
6368bef4e1 Merge pull request #18845 from thatch45/bootstrap_paths
Add more paths to syspaths
2014-12-09 10:55:36 -07:00
Thomas S Hatch
2fad613c6f Add more paths to syspaths 2014-12-09 10:54:38 -07:00
Elias Probst
b9f5c83b17 Pylint. 2014-12-09 18:20:02 +01:00
Elias Probst
9250786fdf Add missing import of 'salt.utils'. 2014-12-09 18:19:49 +01:00
Nicole Thomas
48e1df7bee Merge pull request #18776 from jfindlay/quote_virtualenv
unquote venv mod commands
2014-12-09 08:50:32 -07:00
Justin Findlay
b7467f5f45 update venv unit tests accordingly 2014-12-08 23:28:28 -07:00
Justin Findlay
61e92c46ce unquote venv mod commands 2014-12-08 23:01:08 -07:00
Ryan Lane
8e2a9f886c Do not sync grains in grains.setval when using local mode 2014-12-08 14:59:17 -08:00
C. R. Oldham
f31afbdb58 Fix pylint, remove unecessary call to pu.db 2014-12-08 15:35:56 -07:00
Pedro Algarvio
fdc39d0413 Remove deprecated options 2014-12-08 22:24:19 +00:00
Elias Probst
44e571fd1a Pylint. 2014-12-08 23:20:33 +01:00
Elias Probst
0e9d22b3a8 No exceptions in execution modules. 2014-12-08 23:20:00 +01:00
Thomas S Hatch
8a8d8883c6 Merge pull request #18816 from lyft/six-to-2014-7
Add salt.ext.six to 2014.7 for module backwards compat from develop
2014-12-08 15:08:39 -07:00
Ryan Lane
70f6ed86f6 Add salt.ext.six to 2014.7 for module backwards compat from develop 2014-12-08 13:32:53 -08:00
Elias Probst
2659b0ceae Documentation improvements for 'set_()'. 2014-12-08 22:17:09 +01:00
C. R. Oldham
c068c37f2d Fix logic error introduced sometime in the past 6 months that prevented all modules from being loaded. 2014-12-08 14:11:30 -07:00
Elias Probst
203bad4af0 Don't try to run blindly non-existent modules. 2014-12-08 21:54:40 +01:00
Elias Probst
8815232900 Documentation improvements for 'exec_action()'. 2014-12-08 21:49:22 +01:00
Nicole Thomas
76db5fdfe0 Merge pull request #18798 from s0undt3ch/2014.7
Make coverage reports optional
2014-12-08 13:40:14 -07:00
Elias Probst
968d7664cf Documentation improvements for 'set_target()'. 2014-12-08 21:39:33 +01:00
Elias Probst
72e8999b8e Handle '(unset)' as return value (when no target is set) in get_current_target(). 2014-12-08 21:32:12 +01:00
Elias Probst
fed9f2d778 Documentation improvements for 'get_current_target()'. 2014-12-08 21:29:52 +01:00
Thomas S Hatch
521cb2f82a Merge pull request #18804 from garethgreenaway/12178_debian_briding
fixes to debian_ip.py
2014-12-08 13:27:24 -07:00
Thomas S Hatch
0c6655544c Merge pull request #18782 from rallytime/master_tops_rendering
Fix markup so master_tops document will render correctly
2014-12-08 13:21:00 -07:00
Thomas S Hatch
989a11f147 Merge pull request #18780 from rallytime/pymongo_note
Add pymongo requirement notification to mongodb_user state
2014-12-08 13:18:11 -07:00
Thomas S Hatch
d0b3b05dcf Merge pull request #18771 from rallytime/list_not_tuple
Use a list instead of a tuple when running dpkg-query command
2014-12-08 13:16:27 -07:00
Elias Probst
eede21b702 Be a bit more careful with the results of 'exec_action()' and also sanitize them a bit.
In case the 'exec_action()' call for 'get_target_list()' returned no
results, because there were no available targets, the module would
stacktrace.
2014-12-08 21:12:15 +01:00
Thomas S Hatch
589ce8f981 Merge pull request #18767 from garethgreenaway/18474_2014_7_not_updating_fstab
Fixes to mount state.
2014-12-08 13:11:23 -07:00
Thomas S Hatch
314a4b00df Merge pull request #18739 from cachedout/clean_pub_auth
Job to clean pub auth
2014-12-08 13:08:12 -07:00
Gareth J. Greenaway
d102218b70 Cleaning up the documentation to make it clear that for setting up a network bridge on a Debian or Ubuntu system that the ports argument, specifying what interfaces are part of the bridge, is required. 2014-12-08 11:12:48 -08:00
Pedro Algarvio
e4f39ed32f Fix variable ref 2014-12-08 18:07:04 +00:00
Elias Probst
0a9e2be6c9 Documentation improvements for get_modules() and get_target_list(). 2014-12-08 18:41:30 +01:00
Pedro Algarvio
9bf2f77b2e Make coverage reports optional 2014-12-08 17:32:28 +00:00
Colton Myers
605b5b6939 Merge pull request #18773 from basepi/publish.full_data-wait
[2014.7] Make publish.full_data wait for returns as well
2014-12-08 10:14:38 -07:00