Commit Graph

48137 Commits

Author SHA1 Message Date
Mathieu Le Marec - Pasquet
db280ffa4a lxc: reintroduce reboot/reconfigure 2015-02-28 22:15:17 +01:00
Seth House
90b481b899 Avoid TypeError if Tornado is not installed
Traceback (most recent call last):
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/cmdline.py", line 245, in main
     opts.warningiserror, opts.tags, opts.verbosity, opts.jobs)
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/application.py", line 181, in __init__
     self._init_builder(buildername)
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/application.py", line 243, in _init_builder
     self.emit('builder-inited')
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/application.py", line 504, in emit
     results.append(callback(self, *args))
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/__init__.py", line 551, in process_generate_options
     base_path=app.srcdir)
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 111, in generate_autosummary_docs
     items = find_autosummary_in_files(sources)
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 226, in find_autosummary_in_files
     documented.extend(find_autosummary_in_lines(lines, filename=filename))
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 323, in find_autosummary_in_lines
     current_module, filename=filename))
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/generate.py", line 236, in find_autosummary_in_docstring
     real_name, obj, parent, modname = import_by_name(name)
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/__init__.py", line 460, in import_by_name
     obj, parent, modname = _import_by_name(prefixed_name)
   File "/Users/shouse/tmp/venvs/sphinx/lib/python2.7/site-packages/sphinx/ext/autosummary/__init__.py", line 475, in _import_by_name
     __import__(modname)
   File "/Users/shouse/src/salt/salt/salt/netapi/rest_tornado/__init__.py", line 19, in <module>
     if distutils.version.StrictVersion(tornado.version) >= \
   File "/usr/local/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/version.py", line 40, in __init__
     self.parse(vstring)
   File "/usr/local/Cellar/python/2.7.9/Frameworks/Python.framework/Versions/2.7/lib/python2.7/distutils/version.py", line 105, in parse
     match = self.version_re.match(vstring)
 TypeError: expected string or buffer
2015-02-28 13:23:00 -07:00
Pedro Algarvio
051f3c3d3c Py3 compat and remove unused imports 2015-02-28 19:54:14 +00:00
Pedro Algarvio
30322e2d84 Add fun and state to the runtime internal keywords listing
Fixes #21120
Refs #21133
Refs https://github.com/saltstack/salt/issues/18806#issuecomment-76532356
2015-02-28 19:42:16 +00:00
Pedro Algarvio
ca1814f9a3 Py3 compat and remove unused imports 2015-02-28 19:30:44 +00:00
Pedro Algarvio
51150d2ed2 Fix _text_type references 2015-02-28 19:27:23 +00:00
Pedro Algarvio
60b28a0f94 Merge pull request #21158 from terminalmage/2015.2-develop
Merge 2015.2 branch into develop
2015-02-28 19:25:35 +00:00
Pedro Algarvio
ea5317f2e0 Let's not forget to remove the log message 2015-02-28 19:23:09 +00:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
Erik Johnson
5573b18624 Fix more py3-incompatible print statements 2015-02-28 12:15:16 -06:00
Erik Johnson
93e1805c14 Lint fix 2015-02-28 12:13:41 -06:00
Erik Johnson
84de5b23af Merge pull request #21160 from terminalmage/lint-2015.2
Don't use print statement without parenthesis (py3 compat)
2015-02-28 11:49:13 -06:00
Erik Johnson
afb8439c1f update test_valid_docs 2015-02-28 11:47:12 -06:00
Erik Johnson
86937eedc4 Don't use print statement without parenthesis (py3 compat)
This backports a lint fix from #21158 into the tests for 2015.2.
2015-02-28 11:41:51 -06:00
Erik Johnson
465c729611 Merge pull request #21156 from terminalmage/container-resource
Split out _run() func into container_resource.py
2015-02-28 10:32:51 -06:00
Erik Johnson
0f2bc036d4 Split out _run() func into container_resource.py
This is in preparation for nspawn re-using this same code in a future
release.
2015-02-28 10:29:22 -06:00
Erik Johnson
5b83b5e9a4 Add salt.modules.container_resource 2015-02-28 10:29:21 -06:00
Chris Nixon
9b5be197fe Add support for git remote helpers to gitfs
The checks to see if a transport is supported in gitfs.py are overly
restrictive. By making them more permissive we get working
git-remote-helpers work for free.

The underlying git layer still throws good errors if an unsupported
transport is used, so there isn't any loss of correctness.
2015-02-28 16:28:21 +00:00
Pedro Algarvio
5bbc21f3c2 Merge pull request #21125 from jfindlay/cmd_tests
add cmd module integration tests
2015-02-28 16:24:42 +00:00
Nicole Thomas
6eded8fb43 Merge pull request #21152 from s0undt3ch/2015.2
[2015.2] Update bootstrap script to latest stable, v2015.02.28
2015-02-28 09:05:00 -07:00
Nicole Thomas
36776e7cfa Merge pull request #21151 from s0undt3ch/2014.7
[2014.7] Update bootstrap script to latest stable, v2015.02.28
2015-02-28 09:04:41 -07:00
Nicole Thomas
d7bd2c38ae Merge pull request #21153 from rallytime/merge-21142
Merge #21142 with Pylint Fix
2015-02-28 08:47:21 -07:00
Steve Weber
4b6e620b2b service mod_watch init_delay
untested...
https://github.com/saltstack/salt/issues/20631
2015-02-28 10:25:51 -05:00
rallytime
554aaa4bb3 Pylint fix 2015-02-28 08:12:21 -07:00
Pedro Algarvio
a01a3c29c8 Update bootstrap script to latest stable, v2015.02.28
* Fix Debian backports repository.
2015-02-28 15:11:21 +00:00
Pedro Algarvio
0e5adace27 Update bootstrap script to latest stable, v2015.02.28
* Fix Debian backports repository.
2015-02-28 15:10:20 +00:00
Erik Johnson
5cc7b61d8a Merge pull request #21147 from terminalmage/rename-lxc-cmd-funcs
Rename new lxc.cmd_run*, lxc.cmd_retcode functions
2015-02-28 00:11:12 -06:00
Erik Johnson
c734a7db18 Update LXC tutorial to reflect function name change 2015-02-27 23:10:22 -06:00
Erik Johnson
694a4678aa Rename new lxc.cmd_run*, lxc.cmd_retcode functions
These are often typo'ed due to their resemblance to cmd.run,
cmd.run_stdout, etc. This commit renames them, removing the "cmd_" and
making them lxc.run, lxc.run_stdout, etc.

Now's the time to do this since these functions have not yet seen an
official release.
2015-02-27 23:10:22 -06:00
C. R. Oldham
c24834291b Merge pull request #21136 from cro/2015-02-27mergeforward1
Merge forward from 2014.7 to 2015.2.
2015-02-27 21:55:29 -07:00
C. R. Oldham
1ff3192c20 Fileserver lists return lists 2015-02-27 17:24:25 -07:00
Michael Nguyen
5abbafb743 Fix ordering of generated interfaces in the /etc/network/interface file 2015-02-27 16:02:30 -08:00
Gareth J. Greenaway
cd5234efc4 Fixing a typo in the debian_ip module. 2015-02-27 15:49:49 -08:00
Aditya Kulkarni
d4c3bbf166 Merge pull request #21139 from pass-by-value/update_config_wheel
Add wheel function to update master config
2015-02-27 16:48:46 -07:00
Eric Cook
3a453155eb shell completion: test the correct cache for minions 2015-02-27 18:31:58 -05:00
Justin Findlay
17b8f73f1b add cmd module integration tests 2015-02-27 16:30:05 -07:00
jfindlay
02d3b3e64c Merge pull request #21135 from cro/ugly_pyrax_error2
Import salt.utils.openstack.pyrax differently to avoid failed import by loader
2015-02-27 16:22:32 -07:00
jfindlay
3f415683e9 Merge pull request #21080 from freimer/private_key_fix
Private key fix
2015-02-27 16:21:53 -07:00
Aditya Kulkarni
1f1bb2954f Add wheel function to update master config 2015-02-27 15:59:14 -07:00
C. R. Oldham
3034c343ba Fixup a few merge conflict problems & pylint 2015-02-27 15:26:51 -07:00
Fred Reimer
7976f5a694
Added pylink disable W0611 2015-02-27 17:23:35 -05:00
cgtx
8a1df6cfa4 add init system to default grains (resolve #20124) 2015-02-27 16:05:46 -06:00
C. R. Oldham
c9610bc4f2 Merge commit, merge forward 2014.7 to 2015.2 2015-02-27 15:01:30 -07:00
jond64
f8bde515fd Fix for #21039 2015-02-27 14:54:00 -07:00
Erik Johnson
12e37a391e add missing import 2015-02-27 14:54:00 -07:00
Erik Johnson
6bfa45c6d4 add argument explanation to docstring 2015-02-27 14:53:59 -07:00
Robert Fach
6395e91de4 fixed invalid changes data issue 2015-02-27 14:53:59 -07:00
Robert Fach
23e48fbcbf fixed identation 2015-02-27 14:53:59 -07:00
Robert Fach
e8eb6fe6ff fixed issue where user option is internally transformed to username which is what /proc/mounts reports for cifs mounts 2015-02-27 14:53:59 -07:00
Robert Fach
983d615d5e added options auto, users to mount invisible options 2015-02-27 14:53:59 -07:00