Commit Graph

15505 Commits

Author SHA1 Message Date
David Boucha
e6f4b54634 Merge pull request #6227 from UtahDave/develop
Add missing import
2013-07-18 16:48:21 -07:00
David Boucha
2782006d54 Add missing import 2013-07-18 17:47:53 -06:00
David Boucha
123e81de74 Merge pull request #6226 from UtahDave/develop
Add missing import
2013-07-18 16:42:02 -07:00
David Boucha
73e4d3aff7 Add missing import 2013-07-18 17:41:08 -06:00
David Boucha
beced9e6b2 Merge pull request #6225 from terminalmage/mysql-error-reporting
Improve mysql error handling/reporting
2013-07-18 16:30:22 -07:00
Erik Johnson
df6c908d59 Improve mysql error handling/reporting
Numerous try/excepts have been added to the mysql module to catch
exceptions like authentication failures/timeouts, permission issues,
etc. Additionally, the mysql_database and mysql_grants states have been
modified to report the mysql errors caught by the try/excepts.
2013-07-18 18:23:05 -05:00
Thomas S Hatch
f953460911 Merge pull request #6224 from terminalmage/issue6211
Remove 'refresh' argument from solarispkg.install
2013-07-18 14:32:49 -07:00
Pedro Algarvio
9f134a9308 The value of err needs to be "fetched" first. 2013-07-18 22:23:28 +01:00
Thomas S Hatch
4e7894d70f Merge pull request #6173 from terminalmage/issue5550
Add ability to set passwordless login (mysql_user)
2013-07-18 13:40:56 -07:00
Erik Johnson
8ba38980af Remove 'refresh' argument from solarispkg.install
This argument is unused. Removed from function definition and a warning
is now logged when it is present and True.
2013-07-18 13:24:04 -05:00
Joseph Hall
5a64dab499 Merge pull request #6223 from terminalmage/docs
Remove ref to salt/modules in module writing docs
2013-07-18 10:46:57 -07:00
Erik Johnson
3cc1bb94f2 Add ref/tops/all/salt.tops.reclass_adapter.rst
auto-gen'ed rst file for new reclass adapter
2013-07-18 12:29:32 -05:00
Erik Johnson
87d0c07eb2 Remove ref to salt/modules in module writing docs
A beginner is not going to know what this means, so don't muddy the
waters with this info. Besides, new modules should only go in
salt/modules once they are accepted into salt proper. Custom modules
should pretty much always go into _modules.
2013-07-18 12:26:39 -05:00
Pedro Algarvio
912a96802b Merge pull request #6221 from aboe76/suse_packages
updated changes file to reflect 0.16.0 init fix
2013-07-18 10:07:53 -07:00
David Boucha
feabb34f5a Merge pull request #6222 from ranl/develop
reg module/state support for all Value Types
2013-07-18 00:46:15 -07:00
ran
c6c5332395 reg module/state support for all Value Types 2013-07-18 09:44:18 +03:00
Niels Abspoel
b4e1661c91 updated changes file to reflect 0.16.0 init fix 2013-07-18 07:37:00 +02:00
David Boucha
e0ddefcdbb Merge pull request #6206 from felskrone/pullsock_reconnect_delay
added reconnect dealy for the minion zmq-pull socket
2013-07-17 21:39:15 -07:00
David Boucha
62b46c7cdc Merge pull request #6199 from s0undt3ch/develop
Fix `SyntaxError`, call `super` and properly call `super`.
2013-07-17 21:35:51 -07:00
Erik Johnson
776fb000b7 punctuation fix 2013-07-17 22:06:08 -05:00
Erik Johnson
6930776d75 Add ability to set passwordless login (mysql_user)
This commit adds the ability to set a passwordless login. This
functionality requires a new keyword argument (allow_passwordless) be
True.

Fixes #5550.
2013-07-17 22:06:08 -05:00
Thomas S Hatch
daa455a528 SaltStack not Salt Stack 2013-07-17 18:24:24 -06:00
David Boucha
6633a81c42 Merge pull request #6217 from basepi/tmpfiles
Revert "fix" for windows itertools.  Just import itertools in win_file.py instead.
2013-07-17 15:48:16 -07:00
Colton Myers
4206da594a Fix PEP8 stuff 2013-07-17 16:46:18 -06:00
Colton Myers
6aafdb3cc5 Import itertools in win_file.py 2013-07-17 16:45:23 -06:00
Colton Myers
51ea024b1c Revert "Fix tmpfile cleanup for windows (itertools not supported), Fix #6209"
This reverts commit 03561b7840.
2013-07-17 16:44:26 -06:00
Joseph Hall
99f888d3fa Merge pull request #6216 from basepi/tmpfiles6209
Fix tmpfile cleanup for windows (itertools not supported), Fix #6209
2013-07-17 13:47:58 -07:00
Colton Myers
03561b7840 Fix tmpfile cleanup for windows (itertools not supported), Fix #6209
Rather than continue the list comprehensions that have given trouble
previously, I just did it with an easy-to-follow nested loop.
2013-07-17 14:34:07 -06:00
Joseph Hall
5fdfc997e2 Merge pull request #6215 from basepi/jidpath6203
Make sure nothing exists at jid path before creating dir, Fix #6203
2013-07-17 13:26:42 -07:00
Colton Myers
3628604d94 Fix indents (how did this happen?) 2013-07-17 14:22:28 -06:00
Colton Myers
f88d8fde0b Make sure nothing exists at jid path before creating dir, Fix #6203 2013-07-17 14:21:06 -06:00
Joseph Hall
403ca2671e Merge pull request #6208 from terminalmage/issue6200
Fix caching of 0-byte files
2013-07-17 11:22:35 -07:00
Joseph Hall
abb98845d8 Merge pull request #6210 from hulu/smf-reload-func-alias
add __func_alias__ for modules.smf.reload
2013-07-17 11:22:01 -07:00
Chris Rebert
486e4e2b40 add __func_alias__ for modules.smf.reload
************* Module salt.modules.smf
W0622:117,0:reload: Redefining built-in 'reload'
2013-07-17 10:55:16 -07:00
Erik Johnson
98cbc25b64 Fix caching of 0-byte files
For some reason there was a check to see that the destination for the
cached file exists before writing an empty file. This prevented a 0-byte
file from overwriting a previously non-empty file in the cachedir. This
commit removes that check for the cache file's existence, allowing it to
be overwritten.
2013-07-17 12:26:53 -05:00
Volker Schwicking
cf77eca666 added reconnect dealy for the minion zmq-pull socket 2013-07-17 18:46:43 +02:00
Pedro Algarvio
7aed6aeb30 Actually, the Syndic config test case can be a simple unit test. 2013-07-17 16:43:18 +01:00
Pedro Algarvio
e467b1e00b Simplify the Syndic configuration testing.
* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
2013-07-17 16:22:18 +01:00
Joseph Hall
cde67fc997 Merge pull request #6204 from YanChii/solaris-smf-refresh
added service refresh function to Solaris SMF
2013-07-17 08:18:41 -07:00
Erik Johnson
7619d6f92b Merge pull request #6196 from hulu/6160-fixup
mysql mod: use connection_args within db_check() too
2013-07-17 08:15:11 -07:00
YanChii
dd9b8c2716 added service refresh function to Solaris SMF 2013-07-17 16:56:21 +02:00
Pedro Algarvio
54ea179467 Only create TMP if it doesn't already exists (hint: --no-clean) 2013-07-17 12:34:36 +01:00
Pedro Algarvio
8763323366 Install timelib in the Travis-CI environment. 2013-07-17 11:26:27 +01:00
Pedro Algarvio
db6553a019 Skip unit.templates.jinja_test.TestGetTemplate.test_strftime test if timelib is not installed. 2013-07-17 11:23:42 +01:00
Pedro Algarvio
1b451be617 Fix SyntaxError, call super and properly call super. 2013-07-17 10:46:01 +01:00
Pedro Algarvio
e78c907db0 Merge pull request #6195 from cvrebert/patch-1
.now() is a classmethod, not a module function
2013-07-17 02:35:34 -07:00
Pedro Algarvio
4c76675ad2 Merge pull request #6197 from cvrebert/patch-2
renderers.yaml: rm unused import of getopt
2013-07-17 02:34:40 -07:00
Pedro Algarvio
770c586c4a Merge pull request #6198 from cvrebert/patch-3
utils/__init__.py: some copyediting
2013-07-17 02:33:57 -07:00
Chris Rebert
f9d5f1919b utils/__init__.py: some copyediting 2013-07-16 23:10:59 -07:00
Chris Rebert
f7f2f97dc3 renderers.yaml: rm unused import of getopt
************* Module salt.renderers.yaml
W0611:  4,0: Unused import getopt
2013-07-16 23:00:45 -07:00