Thomas S Hatch
f8553e70d6
Merge pull request #7015 from s0undt3ch/develop
...
Only get the tags which match salt's version tags formatting.
2013-09-03 16:41:36 -07:00
Pedro Algarvio
50400e1487
Only get the tags which match salt's version tags formatting.
2013-09-04 00:37:59 +01:00
Jared W. Robinson
06650c6cb5
Bugfix for interacting with yum -- bug seen on CentOS 6.4, with Python 2.6 using pkg.installed.sources.
2013-09-03 17:24:03 -06:00
Thomas S Hatch
ae2a71457c
Merge pull request #7012 from mgwilliams/lxc
...
lxc: use gen_mac from salt.utils
2013-09-03 14:51:38 -07:00
Matthew Williams
b5a7b47eab
Merge branch 'develop' into lxc
2013-09-03 21:46:57 +00:00
Thomas S Hatch
8610c832a8
Merge pull request #7010 from mgwilliams/docs
...
tweak docstrings
2013-09-03 14:39:15 -07:00
Matthew Williams
ce9fe2ae23
lxc: use gen_mac from salt.utils
2013-09-03 21:37:15 +00:00
Matthew Williams
98534dc000
Merge branch 'develop' into lxc
2013-09-03 21:35:28 +00:00
Thomas S Hatch
77ea5d47c7
silly pylint fix
2013-09-03 14:58:39 -06:00
Thomas S Hatch
cc20c34da3
fix bad ref to the minion's opts
2013-09-03 14:26:08 -06:00
Matthew Williams
ef1a4e5eb0
ps: tweak docstrings
2013-09-03 20:23:18 +00:00
Thomas S Hatch
66d6b22d17
Add initial state wfunc module
2013-09-03 14:23:06 -06:00
Thomas S Hatch
56e2777803
Add arg passing to wrapper funcs from top level
2013-09-03 14:23:05 -06:00
Matthew Williams
ee692c103c
Merge branch 'lxc' into docs
2013-09-03 20:20:32 +00:00
Matthew Williams
21cd4cccc0
lxc: tweak docstring
2013-09-03 20:19:10 +00:00
Thomas S Hatch
bad62e5d16
Merge pull request #7009 from mgwilliams/lxc
...
add lxc module
2013-09-03 13:17:33 -07:00
Thomas S Hatch
39832dbc04
Merge pull request #7008 from mgwilliams/seed
...
move seed functions into seed module from img
2013-09-03 13:15:19 -07:00
Thomas S Hatch
15bd86ea4c
Merge pull request #7007 from mgwilliams/ps
...
docstring formatting in ps module and whitespace removal
2013-09-03 13:14:30 -07:00
Thomas S Hatch
73b5f22bb6
Merge pull request #7006 from s0undt3ch/hotfix/remove-catchall-exception
...
Remove miss-leading exception.
2013-09-03 13:12:53 -07:00
Thomas S Hatch
f289c26779
Merge pull request #7005 from s0undt3ch/develop
...
Remove extra white-space.
2013-09-03 13:11:28 -07:00
Matthew Williams
82005f1230
add lxc module
2013-09-03 20:04:23 +00:00
Pedro Algarvio
268b5f29d2
Remove miss-leading exception.
2013-09-03 20:57:29 +01:00
Matthew Williams
190978cac9
move seed functions into seed module from img
2013-09-03 19:51:27 +00:00
Matthew Williams
4cd5502a7f
docstring formatting in ps module
2013-09-03 19:45:07 +00:00
Pedro Algarvio
82f9c88be8
Remove extra white-space.
2013-09-03 20:42:58 +01:00
Thomas S Hatch
7d21c3b934
Fix #6963
...
we don;t need to bother with yaml if the type is not string,
because the type is already defined.
2013-09-03 13:20:00 -06:00
Seth House
82d1fe8409
Changed package-map.jinja references to map.jinja
2013-09-03 13:24:27 -06:00
Seth House
cbf0b79ab5
Updated Salt version requirements for Formulas
2013-09-03 13:24:27 -06:00
Thomas S Hatch
81ba8889da
Merge pull request #6998 from holmboe/patch-1
...
Syntax of versionadded
2013-09-03 12:19:15 -07:00
David Boucha
26d520da91
Merge pull request #7004 from UtahDave/update_tests
...
Update tests
2013-09-03 12:17:42 -07:00
Thomas S Hatch
767bb0340d
Merge pull request #6995 from ranl/modjk
...
fixing duplicate output of modjk
2013-09-03 12:07:19 -07:00
Pedro Algarvio
7dcf25bd85
Merge pull request #7002 from riverajo/postgres-distutil
...
Postgres distutil
2013-09-03 11:44:14 -07:00
Joseph D Rivera
88742f3a41
use the comparability of LooseVersion to do version checking
2013-09-03 17:58:51 +00:00
David Boucha
1a216bf08c
remove commented out code
2013-09-03 11:39:21 -06:00
David Boucha
fa489634a5
check for multiple strings in the test
2013-09-03 11:37:46 -06:00
Joseph D Rivera
a51c86ef49
distutil.version is not in distutil all
2013-09-03 17:17:26 +00:00
David Boucha
8ec7e1a7bd
Merge pull request #6997 from joehealy/windows_package_manager_doc_improvements
...
Improvements to the windows package manager page.
2013-09-03 08:42:04 -07:00
Henrik Holmboe
46fb3bcf28
Syntax of versionadded
2013-09-03 14:59:14 +02:00
Joe Healy
69b8df8c76
Improvements to the windows package manager page.
...
The aim is to give a bit of a high level intro and also to
aid troubleshooting.
2013-09-03 22:50:33 +10:00
ranl
9483c2d361
changing has_key function
2013-09-03 12:27:33 +03:00
ranl
451090ac13
fixing duplicate output of modjk
2013-09-03 11:04:39 +03:00
Thomas S Hatch
b1065128bd
Merge pull request #6988 from giantlock/develop
...
fix issues #6542 , #6954
2013-09-03 00:15:53 -07:00
Thomas S Hatch
6924e40c6b
Merge pull request #6987 from mgwilliams/urllib2
...
use urllib2 instead of urllib
2013-09-03 00:15:26 -07:00
David Boucha
789c4a7aea
Merge pull request #6993 from UtahDave/develop
...
split those strings on their path
2013-09-02 23:55:54 -07:00
David Boucha
6fd2146239
split those strings on their path
2013-09-03 00:53:10 -06:00
Thomas S Hatch
e1b5958873
switch salt-ssh over to threading model
2013-09-03 00:39:32 -06:00
Thomas S Hatch
8b30023b82
clean up lint errors
2013-09-02 23:53:17 -06:00
Thomas S Hatch
d6d4282e31
Allow for wfuncs to be passed in and created later on
2013-09-02 23:44:33 -06:00
Thomas S Hatch
29076b020d
Add threading routines to manage ssh executions
...
Yes, I am adding the use of the threading lib. This is ok because these
are all IO wait threads, it also much more cleanly matches the way salt
works wrt allowing minions to opporate in standalong constructs, the
queue interface also allows for event like handling of actions similar
to the rest of Salt.
2013-09-02 23:44:33 -06:00
Thomas S Hatch
b3d8d2c648
update ssh loader routines to take the wrapper as __salt__
2013-09-02 23:44:33 -06:00
