Commit Graph

16173 Commits

Author SHA1 Message Date
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
Corey Quinn
fd14102516 Fixing whitespace 2013-07-29 13:57:35 -07: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
Corey Quinn
62d0415505 Add a major version 2013-07-29 12:33:56 -07:00
Matthew Williams
be47f839ba virt.list: break list down by state 2013-07-29 18:55:15 +00: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
Pedro Algarvio
0180c7b1fd Properly parse a PSQL server version, even beta versions. Fixes #6352. 2013-07-28 16:46:58 +01:00
ran
7903b5d785 docstring fix 2013-07-28 17:23:34 +03:00
ran
01ea85d802 tomcat.passwd function, convert clear-text password to tomcat-users.xml file 2013-07-28 17:18:53 +03:00
Joseph Hall
d64dfdc70a Merge pull request #6395 from s0undt3ch/sprint/mock-salt.modules.alternatives
Also test for `retcode > 0`.
2013-07-28 05:18:29 -07:00
Pedro Algarvio
5d0af6268e Mocked test for salt.modules.archive.gunzip() 2013-07-28 12:51:13 +01:00
Pedro Algarvio
99b8f2f70f Mocked test for salt.modules.archive.gzip() 2013-07-28 12:50:05 +01:00
Pedro Algarvio
3d17053e3f Also test for retcode > 0. 2013-07-28 12:41:15 +01:00
David Boucha
50bb0eb0f0 Merge pull request #6394 from UtahDave/develop
user proper spaces around '='
2013-07-28 00:19:21 -07:00
David Boucha
3f8c91f1d1 user proper spaces around '=' 2013-07-28 01:13:52 -06:00
David Boucha
a666fb07d2 Merge pull request #6393 from UtahDave/develop
Fix pylin errors in win_useradd.py
2013-07-27 23:59:10 -07:00
David Boucha
88bdc2ca40 Fix pylin errors in win_useradd.py 2013-07-28 00:57:39 -06:00
David Boucha
cc0155834c Merge pull request #6392 from UtahDave/develop
Document new Windows Repo module
2013-07-27 23:52:48 -07:00
David Boucha
5a8fb7a38d better wording in winrepo 2013-07-28 00:50:44 -06:00
David Boucha
81bf77f4d3 mention winrepo execution module 2013-07-28 00:48:04 -06:00
David Boucha
65b2b66080 Merge pull request #6391 from iquaba/develop
Windows list_users
2013-07-27 19:03:36 -07:00