Thomas S Hatch
51e2ca5220
Merge pull request #2624 from giantlock/develop
...
some minor fixes for svn module
2012-11-18 09:23:50 -08:00
Thomas S Hatch
a375839be9
Merge pull request #2622 from archtaku/develop
...
Multi-source added for yumpkg{,5}.py
2012-11-18 09:14:20 -08:00
Denis Generalov
e6b99a8329
*) username was passd twice in commit(), remove() and status()
...
*) pep8 fix
2012-11-18 19:57:51 +04:00
Erik Johnson
5a6e7c5bd1
Multi-source added for yumpkg{,5}.py
...
Plus some miscellaneous cleanup.
2012-11-18 02:40:33 -06:00
Thomas S Hatch
c1cf1d5ca9
Merge pull request #2621 from archtaku/develop
...
More multiple package source goodness
2012-11-17 23:26:10 -08:00
Thomas S Hatch
cddda9f9f0
Initial commit towards overstate
2012-11-18 00:25:27 -07:00
Thomas S Hatch
2890ccbfe0
Make cmd_iter use the same seq as cmd_cli
2012-11-18 00:25:27 -07:00
Erik Johnson
b96e4802a5
More multiple package source goodness
...
pacman.py now done. Additionally, common functions needed for
pkg.install have been broken out into pkg_resource.py. zypper.py has
been updated to use the functions in pkg_resource.py.
Yay, code re-use!
2012-11-18 01:07:25 -06:00
Thomas S Hatch
c0f3c280cf
Merge pull request #2620 from kjkuan/develop
...
Fix issue #2592
2012-11-17 21:24:10 -08:00
Jack Kuan
4d26300dcf
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-18 00:19:58 -05:00
Jack Kuan
59364d02a6
Fix issue #2592 .
...
Added an extra, optional, 'tmplpath', keyword argument to template
functions and renderers. The argument should be provided to the
renderers as a hint when the source of a template is from a file.
2012-11-18 00:13:21 -05:00
Thomas S Hatch
754ab1de73
Merge pull request #2619 from archtaku/develop
...
Implement multiple package sources (zypper)
2012-11-17 20:07:53 -08:00
Erik Johnson
cd010f4dc1
Implement multiple package sources (zypper)
...
In addition, I have completed the Suse audit (#2436 ). Everything looks
OK, however I have only tested on OpenSUSE 12.2.
The below pastebins contain thorough results:
zypper.py module: http://pastebin.com/G2MCPR6Z
Suse grains: http://pastebin.com/Du03x50H
2012-11-17 19:41:44 -06:00
Thomas S Hatch
0057c81a25
Merge pull request #2617 from s0undt3ch/develop
...
Tests sync timer accuracy, cleanup, etc
2012-11-17 10:19:37 -08:00
Pedro Algarvio
f67d24cf30
Minor cosmetic change.
2012-11-17 17:43:23 +00:00
Pedro Algarvio
526ed994b8
Test for deprecation message first and then use the new --out format.
2012-11-17 17:39:06 +00:00
Pedro Algarvio
5bf4549777
Use actual time, to reduce time.sleep() inaccuracy.
2012-11-17 17:37:53 +00:00
Thomas S Hatch
a35419c156
Merge pull request #2614 from s0undt3ch/develop
...
Switch missed `open()` calls to `salt.utils.fopen()`.
2012-11-17 09:03:39 -08:00
Pedro Algarvio
06bcd17395
This module was previously removed.
2012-11-17 16:40:27 +00:00
Pedro Algarvio
61881713c0
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-17 16:39:04 +00:00
David Boucha
902f522113
Merge pull request #2612 from bclermont/develop
...
Fix missing module
2012-11-17 08:11:58 -08:00
Bruno Clermont
acad562f67
import absolute module
2012-11-18 00:06:57 +08:00
Bruno Clermont
391a6eb78c
add missing imports
2012-11-17 23:55:19 +08:00
Pedro Algarvio
9161143d87
Switch missed open() calls to salt.utils.fopen().
2012-11-17 14:25:50 +00:00
Thomas S Hatch
1b8889a16d
Merge pull request #2607 from kjkuan/develop
...
Fix the py renderer broken by the introduction of render pipes.
2012-11-16 19:36:50 -08:00
Thomas S Hatch
25cee30dcc
Fix #2593
2012-11-16 20:35:40 -07:00
Jack Kuan
234034b084
Remove redundant check for the availability of OrderedDict.
2012-11-16 22:28:36 -05:00
Jack Kuan
e19e3f2770
Fix issue #2602 : py renderer broken after introducing render pipes.
2012-11-16 22:26:23 -05:00
Thomas S Hatch
f3374741cf
Add cp.get_file_str to fix #2604
2012-11-16 20:20:08 -07:00
Thomas S Hatch
61b5fb7fcd
Merge pull request #2605 from kjkuan/develop
...
Make the yaml renderer raise a SaltRenderError
2012-11-16 18:32:40 -08:00
Jack Kuan
105ed7f700
Make the yaml renderer raise a SaltRenderError when used with option -o
...
but no OrderedDict is available.
2012-11-16 21:23:46 -05:00
Pedro Algarvio
bed55506c3
Proper OrderedDict check.
2012-11-17 01:19:37 +00:00
David Boucha
91230f0c82
Merge pull request #2603 from UtahDave/develop
...
Fix indent error
2012-11-16 16:59:14 -08:00
David Boucha
79bd9ff614
Fix indent error
2012-11-16 17:56:11 -07:00
David Boucha
cda5c8201a
Merge pull request #2601 from dkehn/fix_mysql.py
...
Fix mysql.py
2012-11-16 16:38:36 -08:00
Thomas S Hatch
259747b084
Merge pull request #2598 from s0undt3ch/cherry-pick/CLOEXEC
...
Fix #2509
2012-11-16 16:38:19 -08:00
dekehn
030ac57c66
Merge remote-tracking branch 'upstream/develop' into HEAD
2012-11-16 17:19:41 -07:00
dekehn
e32bcccb31
fixed a merge issue
2012-11-16 17:13:48 -07:00
David Boucha
231854fdc5
Merge pull request #2599 from l2ol33rt/fix_docs
...
Added documentation to cmd state
2012-11-16 16:12:33 -08:00
David Boucha
0b37ddc6a0
Merge pull request #2596 from kuerzn/develop
...
Fix for #2595 . replace merge with pull for better git compatibility.
2012-11-16 16:08:55 -08:00
David Boucha
892282a7d8
Merge pull request #2597 from s0undt3ch/develop
...
Fix `stateconf` test failing in 2.6 because `OrderedDict` was not available.
2012-11-16 16:06:25 -08:00
Pedro Algarvio
bf1c77446a
Merge branch 'develop' of github.com:saltstack/salt into cherry-pick/CLOEXEC
2012-11-16 23:59:34 +00:00
Robert Hernandez
6121f62ba3
Added documentation to cmd state
2012-11-16 15:25:43 -08:00
Pedro Algarvio
a17d213d59
Fix stateconf test failing in 2.6 because OrderedDict was not available.
2012-11-16 22:53:58 +00:00
Pedro Algarvio
efc9a390bd
More PEP-8
2012-11-16 22:53:38 +00:00
Pedro Algarvio
9110340490
Double to single quotes, .format() and PEP-8 changes.
2012-11-16 22:52:07 +00:00
Pedro Algarvio
89fd313766
Fix stateconf test failing in 2.6 because OrderedDict was not available.
2012-11-16 22:45:12 +00:00
Pedro Algarvio
11792f34a4
More PEP-8
2012-11-16 22:32:10 +00:00
Pedro Algarvio
911b837405
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-16 22:23:03 +00:00
Pedro Algarvio
dc5b8b7109
Double to single quotes, .format() and PEP-8 changes.
2012-11-16 22:20:41 +00:00
