Commit Graph

15426 Commits

Author SHA1 Message Date
David Boucha
dde00a48ed Initial Riak module creation 2013-07-16 17:58:29 -06:00
Thomas S Hatch
a7369c7a15 Start work on creating the state blob tarball 2013-07-16 17:53:11 -06:00
Thomas S Hatch
cbfd3c43ff Add initial state wrapper classes for ssh based states 2013-07-16 17:53:11 -06:00
Thomas S Hatch
5d3727d415 Add function wrapper to embed in ssh based state system 2013-07-16 17:53:11 -06:00
Thomas S Hatch
ab995c62c7 clean up unused import 2013-07-16 17:53:11 -06:00
Colton Myers
8d94913eee Merge pull request #6192 from cvrebert/patch-1
Cleanup the whole darn __clean_tmp() function
2013-07-16 15:34:09 -07:00
Chris Rebert
83c007cb25 Cleanup the whole darn __clean_tmp() function 2013-07-16 15:06:37 -07:00
Joseph Hall
ca0106e692 Merge pull request #6190 from basepi/releasedocs
Add RTD to the release process, Fix #6185
2013-07-16 14:48:40 -07:00
Joseph Hall
6850ed8ced Merge pull request #6189 from basepi/tmpfiles
Simplify list comprehension and get values, not keys
2013-07-16 14:48:19 -07:00
Colton Myers
cda2b31668 Add RTD to the release process, Fix #6185 2013-07-16 15:43:24 -06:00
Colton Myers
cf3b408b2f Simplify list comprehension and get values, not keys
I must have been asleep.
2013-07-16 15:38:27 -06:00
Joseph Hall
c3b765aa55 Merge pull request #6186 from cvrebert/patch-1
jinja's Extension is actually new-style; reassure pylint & use modern super
2013-07-16 11:25:48 -07:00
Chris Rebert
081be28b90 jinja's Extension is actually new-style; reassure pylint & use modern super()
See comments on 96852d96ca
2013-07-16 11:23:22 -07:00
Joseph Hall
c3d7310db0 Merge pull request #6183 from cvrebert/patch-4
utils.parsers: rm unused imports
2013-07-16 11:16:09 -07:00
Joseph Hall
097bfc1e16 Merge pull request #6182 from cvrebert/patch-3
payload.py: rm now-unused import of OrderedDict
2013-07-16 11:15:38 -07:00
Chris Rebert
a384afa5e7 utils.parsers: rm unused imports
************* Module salt.utils.parsers
W0611: 15,0: Unused import copy
W0611: 19,0: Unused import urlparse
W0611: 30,0: Unused import exceptions
2013-07-16 11:11:49 -07:00
Chris Rebert
6dfa3c21f4 payload.py: rm now-unused import of OrderedDict
************* Module salt.payload
W0611: 15,0: Unused import OrderedDict
2013-07-16 11:07:50 -07:00
Joseph Hall
5e9e0e0459 Merge pull request #6181 from terminalmage/issue6175
Fix traceback in sysbench module
2013-07-16 10:34:12 -07:00
Erik Johnson
d3937c898c Fix traceback in sysbench module
This fixes #6175 by altering the regex for total execution time.
Additionally, this commit incudes a spelling change, and a modification
to the dicts returned by the _parser() helper function. There is no
reason why the dictionary keys should have trailing whitespace.
2013-07-16 12:16:48 -05:00
Joseph Hall
810e992fab Merge pull request #6178 from s0undt3ch/develop
Fix bad `env` reference.
2013-07-16 07:53:08 -07:00
Pedro Algarvio
28c50e9bf8 Fix bad env reference. 2013-07-16 13:06:03 +01:00
David Boucha
7b050436ac Merge pull request #6176 from chenming12345/develop
fixed from Issue #6163
2013-07-15 23:12:24 -07:00
chenming12345
08b4845a2a fixed from Issue #6163
This string just needs to be quoted
2013-07-16 14:03:15 +08:00
Erik Johnson
aecb1966bb Merge pull request #6174 from terminalmage/docs
pecl docstring tweak
2013-07-15 21:00:40 -07:00
Erik Johnson
8e7f9a2038 pecl docstring tweak
This moves the notice that the new "defaults" argument will be available
in 0.17.0 to a "note" section for greater emphasis.
2013-07-15 19:00:42 -05:00
Thomas S Hatch
32f4272060 Merge pull request #6172 from mgwilliams/virt-autosign2
virt: preapprove VM keys
2013-07-15 16:29:26 -07:00
Thomas S Hatch
14202b7f89 Merge pull request #6171 from basepi/tmpfiles6118
Don't remove tempfiles if in file_roots, Fix #6118
2013-07-15 16:28:57 -07:00
Matthew Williams
1dbd621f42 virt: preapprove minion keys and better bootstrapping 2013-07-15 23:13:19 +00:00
Colton Myers
c000d42554 Fix syntax error 2013-07-15 16:54:23 -06:00
Colton Myers
84ccfcf0cd Don't remove tempfiles if in file_roots, Fix #6118 2013-07-15 16:50:07 -06:00
Joseph Hall
fbf8500019 Merge pull request #6170 from basepi/useradd6165
Fix bad example in the state tutorial part 3, Fix #6165
2013-07-15 15:05:19 -07:00
Joseph Hall
1a8e1c8031 Merge pull request #6169 from extesy/patch-1
Add extesy to contributors list
2013-07-15 15:04:54 -07:00
Colton Myers
94fe24c905 Fix bad example in the state tutorial part 3, Fix #6165 2013-07-15 15:44:17 -06:00
Oleg Anashkin
998c5bc789 Add extesy to contributors list 2013-07-15 14:38:18 -07:00
Seth House
988b2e50e5 Added the current Salt release to the sidebar 2013-07-15 15:10:34 -06:00
Seth House
4b09672b93 Changed copyright name to the company name 2013-07-15 15:10:34 -06:00
Seth House
74fb3c514f Pull latest release version into the docs conf 2013-07-15 15:10:34 -06:00
Thomas S Hatch
dc7662c8ce Merge pull request #6167 from tgecho/develop
Allow pip paths to use the file:// protocol and allow local files or directories in find_links.
2013-07-15 14:01:07 -07:00
Thomas S Hatch
d03d571b0f Merge pull request #6146 from makinacorpus/develop
fix/feat: let the syndic be way more configurable
2013-07-15 13:59:56 -07:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Thomas S Hatch
630feea240 Merge pull request #6164 from s0undt3ch/issues/6158-log-deprecation-warning
Lint fixes
2013-07-15 08:09:43 -07:00
Thomas S Hatch
0333d31d9b Merge pull request #6161 from davromaniak/develop
displaying secondary ip addresses in the ip_interface grain.
2013-07-15 08:08:55 -07:00
Erik Simmler
3e00805aaa Allow pip paths to use the file:// protocol and allow local files or directories in find_links. 2013-07-15 11:02:12 -04:00
Pedro Algarvio
22d3986863 Local variables should not be uppercased. 2013-07-15 12:38:37 +01:00
Pedro Algarvio
f6be07069a Adapt .pylintrc design settings to Salt's reality. 2013-07-15 12:37:46 +01:00
Cyril Lavier
1ea6674267 displaying secondary ip addresses in the ip_interface grain. 2013-07-15 09:52:50 +02:00
Thomas S Hatch
82759b9402 Merge pull request #6159 from s0undt3ch/issues/6158-log-deprecation-warning
Stop the `__new__` deprecation warning on `salt.log`. Fixes #6158.
2013-07-14 21:46:22 -07:00
Pedro Algarvio
4ef626246e Stop the __new__ deprecation warning on salt.log. Fixes #6158. 2013-07-15 00:40:34 +01:00
Pedro Algarvio
d6b1e60fb1 Added a mocked test case for pip.list with prefix matching. 2013-07-14 20:53:36 +01:00
Pedro Algarvio
21ea17a1c5 Handle nested dictionaries when converting from an OrderedDict into a dict. 2013-07-14 20:06:23 +01:00