Chris Rebert
184dfc9a82
fix #4682
2013-05-15 17:20:34 -06:00
Thomas S Hatch
9889d3f1c7
Merge pull request #5040 from basepi/diskusageosx4958
...
Fix disk.usage for Darwin (osx), Fix #4958
2013-05-15 16:17:20 -07:00
David Boucha
062bdf726c
Merge pull request #5042 from UtahDave/develop
...
return proper var
2013-05-15 15:47:58 -07:00
David Boucha
d2f0041cae
return proper var
2013-05-15 16:47:01 -06:00
Colton Myers
9da3bea48b
Move max open files to info log, not warning
2013-05-15 16:18:51 -06:00
Colton Myers
7ae782ecc2
Do some logic reordering and check for multi-word filesystems
2013-05-15 16:07:30 -06:00
Colton Myers
8aba53784b
Fix disk.usage for Darwin (osx), Fix #4958
2013-05-15 16:07:23 -06:00
David Boucha
7291dae6ee
Merge pull request #5038 from basepi/npm4674
...
Make npm.uninstall and npm.removed more consistent, Fix #4674
2013-05-15 14:53:09 -07:00
Niels Abspoel
f15417c647
Fixed multiple pep8 errors in salt-run code
...
fixed E302 expected 2 blank lines before def ()
fixed E123 closing brackets
fixed W291 trailing whitespace
fixed E128 line under-indented for visual indent
after refactor: no errors
doc.py
jobs.py
virt.py
after refacter:pep8 errors left:
launchd.py:12:80: E501 line too long (102 > 79 characters)
winrepo.py:33:80: E501 line too long (80 > 79 characters)
winrepo.py:41:80: E501 line too long (83 > 79 characters)
winrepo.py:42:80: E501 line too long (96 > 79 characters)
2013-05-15 23:36:02 +02:00
Colton Myers
81a7d2d279
Make npm.uninstall and npm.removed more consistent, Fix #4674
2013-05-15 14:51:43 -06:00
Colton Myers
3929ab64a5
Fix some pep8
2013-05-15 14:47:07 -06:00
Thomas S Hatch
34e78afd4b
Merge pull request #5037 from basepi/unused4720
...
Remove extra .splitlines(), Fix #4720
2013-05-15 13:39:25 -07:00
Colton Myers
473e9299da
Remove extra .splitlines(), Fix #4720
2013-05-15 14:33:29 -06:00
Thomas S Hatch
f73df55229
Merge pull request #5036 from basepi/syncgrains5009
...
Sync the grains on grains.setval, Fix #5009
2013-05-15 12:51:50 -07:00
Colton Myers
e06b07fa18
Sync the grains on grains.setval, Fix #5009
2013-05-15 13:45:27 -06:00
Thomas S Hatch
a4c44aeadb
Merge pull request #5034 from basepi/useroutput5029
...
Use run_all so we get more debug output, Fix #5029
2013-05-15 11:53:36 -07:00
Thomas S Hatch
3391f551ba
Merge pull request #5033 from UtahDave/develop
...
freeze numbers
2013-05-15 11:52:55 -07:00
Thomas S Hatch
91c79a21a8
Fix #4669
2013-05-15 12:44:01 -06:00
Thomas S Hatch
237820fe61
Fix #5010
2013-05-15 12:34:15 -06:00
Colton Myers
b41cdb1c4c
Use run_all so we get more debug output, Fix #5029
2013-05-15 11:48:05 -06:00
Thomas S Hatch
71e9f2e70b
Merge pull request #5028 from sephii/develop
...
Rename build_whitepace_splited_regex to build_whitespace_split_regex
2013-05-15 10:40:31 -07:00
Thomas S Hatch
a0eb4b7bcd
Merge pull request #5032 from basepi/callparse5031
...
Handle args that were previously parsed into lists, Fix #5031
2013-05-15 10:39:31 -07:00
Colton Myers
773fda0fa1
Handle args that were previously parsed into lists, Fix #5031
2013-05-15 10:42:22 -06:00
David Boucha
bc83269e41
freeze numbers
2013-05-15 10:16:43 -06:00
Colton Myers
a4241facdb
Remove unnecessary else
2013-05-15 09:43:21 -06:00
Sylvain Fankhauser
101b9d2f2e
Rename build_whitepace_splited_regex to build_whitespace_split_regex
2013-05-15 12:48:08 +02:00
Colton Myers
825458ecf1
Merge pull request #5026 from UtahDave/add_namespaced_functions
...
Add namespaced functions for win_file.py
2013-05-14 16:56:46 -07:00
David Boucha
c9c71adbc8
add import tempfile
2013-05-14 17:51:19 -06:00
David Boucha
79eb0ba030
remove unused import, add missing comma
2013-05-14 17:49:29 -06:00
David Boucha
e6868fc095
remove unnecessary __clean_tmp function
2013-05-14 17:47:07 -06:00
David Boucha
b24880325d
namespace functions imported from file.py
2013-05-14 17:46:43 -06:00
Thomas S Hatch
6650c251a4
Merge pull request #5025 from basepi/statecheck4904
...
Fix check_state_result for salt-call --local, Fix #4904
2013-05-14 16:33:15 -07:00
Thomas S Hatch
70f1ca3903
Fix #5024
2013-05-14 17:32:13 -06:00
David Boucha
92805d99c8
namespace maor stuff
2013-05-14 17:28:03 -06:00
Colton Myers
08e471dbae
Fix check_state_result for salt-call --local, Fix #4904
2013-05-14 17:26:08 -06:00
David Boucha
6b05a81f01
namespace source_list
2013-05-14 17:12:03 -06:00
David Boucha
dca926cd1c
import __clean_tmp from file.py
2013-05-14 17:09:58 -06:00
David Boucha
71a3082652
namespace manage_file
2013-05-14 17:07:46 -06:00
David Boucha
c6687e69ca
add missing import
2013-05-14 17:05:14 -06:00
David Boucha
9de0b32521
add missing import
2013-05-14 17:03:22 -06:00
David Boucha
042af674dd
namespace makedirs_perms
2013-05-14 16:59:50 -06:00
David Boucha
1a9c376faa
namespace get_managed
2013-05-14 16:57:11 -06:00
David Boucha
839606b8ef
Properly namespace check_perms
2013-05-14 16:29:52 -06:00
David Boucha
54201c9fa9
Add namespaced_function function
...
This will allow for imported functions to live under
the new global namespace.
Copied directly from saltcloud.utils
2013-05-14 16:22:11 -06:00
Colton Myers
70a8ce42d3
Merge pull request #5023 from hulu/stateconf-copyedits
...
salt.renderers.stateconf.rst: add more missing spaces before open parens
2013-05-14 15:17:04 -07:00
Chris Rebert
4f4fe73d05
salt.renderers.stateconf.rst: add more missing spaces before open parens
2013-05-14 14:38:19 -07:00
Joseph Hall
06f03a841f
Merge pull request #5022 from hulu/stateconf-copyedits
...
some copyediting of the stateconf renderer docs
2013-05-14 14:34:01 -07:00
Chris Rebert
571fdd7299
some copyediting of the stateconf renderer docs
2013-05-14 14:32:34 -07:00
Thomas S Hatch
c4d44135bf
Merge pull request #5020 from s0undt3ch/hotfix/lint-and-formatting
...
Lint + Formating + PEP-8
2013-05-14 10:34:51 -07:00
Pedro Algarvio
2769724c17
No need to define logger instead if log(which is properly, not signaled, by pylint). PEP-8 formatting fixes.
2013-05-14 18:28:39 +01:00
