Thomas S Hatch
49d505fa2b
Merge pull request #6415 from bryanchow/develop
...
Add Debian/Ubuntu package compatible service dir to daemontools module
2013-07-29 19:51:34 -07:00
Thomas S Hatch
76e74a5345
Add distutils version checks to gitfs virtual function
2013-07-29 20:46:40 -06:00
Thomas S Hatch
927725e65a
Merge pull request #6412 from KennethWilke/develop
...
Log error for insufficient gitpython version
2013-07-29 19:41:40 -07:00
Thomas S Hatch
9c3fd1d625
Merge pull request #6411 from terminalmage/issue6384
...
Add summary to highstate output
2013-07-29 19:38:09 -07:00
Pedro Algarvio
9be409e95b
Merge pull request #6425 from UtahDave/lockdown_windows
...
Set permissions on Salt dir
2013-07-29 18:41:25 -07:00
David Boucha
5a48188f54
Set permissions on Salt dir
...
Only allow Administrator's group and System user access to
c:\salt
2013-07-29 19:07:52 -06:00
Pedro Algarvio
76f2b31e70
Merge pull request #6421 from terminalmage/issue6338
...
rabbitmq: quote passwd when adding user/changing passwd
2013-07-29 18:07:40 -07:00
Pedro Algarvio
89621b0d80
Merge pull request #6422 from terminalmage/docs
...
Punctuation fix in pillar docs
2013-07-29 18:04:44 -07:00
Pedro Algarvio
5b542b36fd
Merge pull request #6423 from UtahDave/develop
...
bump windows installer version
2013-07-29 18:02:49 -07:00
David Boucha
2b193b0a1d
bump windows installer version
2013-07-29 18:59:48 -06:00
Erik Johnson
17d206b783
Punctuation fix in pillar docs
...
Sentence is missing a period at the end.
2013-07-29 19:56:06 -05:00
Erik Johnson
c9b4bd14f7
Remove unused arg 'name'
...
This was likely the result of the function definition being
copied-and-pasted when this function was added, and the unneeded
argument not being removed.
2013-07-29 19:45:39 -05:00
Erik Johnson
59ea7db81d
rabbitmq: quote passwd when adding user/changing passwd
...
This fixes #6338 , enabling the setting of passwords with characters that
would otherwise be interpolated by the shell by single-quoting the
password.
2013-07-29 19:38:35 -05:00
Erik Johnson
3145ca50e2
Change color for failed states in summary
...
This changes the color for failed states in the summary from red to cyan
if there are no failed states.
2013-07-29 18:56:05 -05:00
Bryan Chow
23789c92e1
Add Debian/Ubuntu package compatible service dir to daemontools module
2013-07-29 15:14:45 -07:00
Pedro Algarvio
2f2d694f7b
Merge pull request #6410 from cvrebert/patch-1
...
state.py: rm unused import of callable()
2013-07-29 15:03:24 -07:00
Colton Myers
13540656e4
Merge pull request #6414 from basepi/freebsd6407
...
Only split on basestring types
2013-07-29 14:20:26 -07:00
Colton Myers
7b2d87700d
Only split on basestring types
2013-07-29 15:18:56 -06:00
Colton Myers
b905e64366
Merge pull request #6413 from terminalmage/issue6407
...
Fix traceback when generating BSD grains
2013-07-29 14:17:30 -07:00
Erik Johnson
8fb2343bfa
Fix traceback when generating BSD grains
...
This fixes a traceback introduced in e72876b
which causes grain
compilation to be incomplete. Fixes #6407 .
2013-07-29 16:09:00 -05:00
Kenneth Wilke
675621497f
Log error for insufficient gitpython version
...
Added log entry for cases when gitpython is below minimum version
Some small pep8 fixes as well
2013-07-29 15:58:53 -05:00
Erik Johnson
36f146b0cf
Add summary to highstate output
...
This commit adds a brief summary to the highstate output. It's an
initial implementation, feel free to tweak it.
2013-07-29 15:56:43 -05:00
Chris Rebert
7b14382de1
state.py: rm unused import of callable()
...
************* Module salt.state
W0611: 30,0: Unused import callable
2013-07-29 13:54:46 -07:00
Jeff Schroeder
2b53ba8172
Merge pull request #6409 from KB1JWQ/corey-shutuplogs
...
Demote configuration file location from INFO to DEBUG
2013-07-29 13:54:02 -07:00
Corey Quinn
9401968d7a
Demote configuration file location from INFO to DEBUG
2013-07-29 13:52:54 -07:00
Joseph Hall
11f98a3223
Merge pull request #6406 from aboe76/suse_packages
...
updated salt package to 0.16.1
2013-07-29 11:42:31 -07:00
Niels Abspoel
2c7b6f82e5
updated salt package to 0.16.1
2013-07-29 20:35:09 +02:00
Thomas S Hatch
b2e41aceeb
Merge pull request #6402 from s0undt3ch/sprint/mock-salt.modules.archive
...
Updates and fixes to `salt.modules.archive` and `salt.utils.decorators.which`
2013-07-29 09:29:13 -07:00
Joseph Hall
04c9bb848f
Merge pull request #6404 from techhat/debapache
...
Adding appropriate docstrings for debian-only functions
2013-07-29 07:32:33 -07:00
Joseph Hall
5adc1f4519
Adding appropriate docstrings for debian-only functions
2013-07-29 08:31:20 -06:00
Pedro Algarvio
fe4dd48474
Any code requiring a function's argspec now uses salt.utils.get_function_argspec()
2013-07-29 08:00:16 +01:00
Pedro Algarvio
14980b7497
Update the archive.tar
mocked test to the new usage.
2013-07-29 06:57:27 +01:00
Pedro Algarvio
2ef634dc0b
salt.modules.archive.tar()
cannot make use of *args
magic.
2013-07-29 06:56:02 +01:00
Pedro Algarvio
7bcad318c5
One more fix to identical_signature_wrapper
the original call should not include the argspec with defaults.
2013-07-29 06:45:58 +01:00
Thomas S Hatch
99bbad42b6
Merge pull request #6397 from ponderability/6079-add-umount
...
6079 add umount when device of mounted filesystem differs
2013-07-28 22:15:27 -07:00
Pedro Algarvio
7873a1284a
We want keyword arguments with their defaults in the signature.
2013-07-29 03:20:31 +01:00
Thomas S Hatch
f84fc73080
Merge pull request #6401 from mgwilliams/virt-list
...
virt: add virt.list to runner module
2013-07-28 19:09:25 -07:00
Matthew Williams
9cddea899f
virt: add virt.list to runner module
2013-07-29 02:05:18 +00:00
Erik Johnson
51c9a70150
Merge pull request #6400 from terminalmage/docs
...
Use double-colon to make cmdline example use PRE tag in docs
2013-07-28 16:07:25 -07:00
Erik Johnson
c3ca853582
Use double-colon to make cmdline example use PRE tag in docs
2013-07-28 18:06:37 -05:00
Pedro Algarvio
1f83aa6743
The wrapped function now uses the same name as the original.
2013-07-28 23:16:06 +01:00
Pedro Algarvio
4855c9427c
Simplify our decorator code and make it reusable.
2013-07-28 22:55:27 +01:00
Pedro Algarvio
73409e025f
Salt needs to have it's module functions with a proper signature.
2013-07-28 22:26:59 +01:00
David Boucha
4abd617196
Merge pull request #6399 from s0undt3ch/hotfix/win-useradd-imports
...
Wrap windows related imports in a try/except to properly handle module loading
2013-07-28 10:12:24 -07:00
Pedro Algarvio
341d7d4a83
Code formatting, logic simplification, fewer local variable.
2013-07-28 18:03:31 +01:00
Pedro Algarvio
5715e30c38
Wrap windows related imports in a try/except to properly handle module loading.
2013-07-28 17:43:41 +01:00
David Boucha
a3dc67c15e
Merge pull request #6398 from s0undt3ch/issues/6352-parser-psql-beta-version
...
Properly parse a PSQL server version, even beta versions
2013-07-28 09:21:26 -07:00
Pedro Algarvio
a4a484a3e6
Typo.
2013-07-28 17:18:39 +01:00
Pedro Algarvio
ef4e2eff44
Formatting fixes.
...
* Double to single quotes.
* Wrap CLI examples.
* Removed unneeded commas from `.format()` call arguments.
* Replaced string substitutions(ie, `%s`) with string formatting(`.format()`)
2013-07-28 17:15:16 +01:00
Joseph Hall
0d3218ec2b
Merge pull request #6396 from ranl/develop
...
tomcat.passwd function
2013-07-28 09:04:13 -07:00