regilero
9a0d33cb83
Small Lint fix
2013-12-12 22:10:32 +01:00
regilero
9eeb8940a4
Be nice with sphinx, in case of, keep password example in ascii
2013-12-12 21:58:07 +01:00
regilero
f1fc1557ff
MySQL module: replace some modula string by format ones, add big comments about the way escapes are working in this module.
2013-12-12 21:54:06 +01:00
regilero
f1b6b4af55
MySQL tests: add a localhost target on mysqladmin test to check for MySQL server presence
2013-12-12 21:23:52 +01:00
regilero
9195f8e5f7
Lint fix
2013-12-11 14:40:42 +01:00
regilero
7ee42dc922
Fix the MySQL user_exists unit test mysterious broken status -- was mocked by other tests
2013-12-11 14:19:29 +01:00
regilero
0d797ced4f
Fix MySQL module broken unit tests
2013-12-11 14:18:33 +01:00
regilero
d14b12baa8
version Hydrogen
2013-12-11 13:36:57 +01:00
regilero
3b14cd7cb4
Merge remote-tracking branch 'upstream/develop' into mysql_additions
2013-12-11 00:56:56 +01:00
regilero
82c1cb8e64
MySQL states, grants integration tests
2013-12-11 00:54:05 +01:00
regilero
0a14c5f3f8
MySQL: fix mysql_grants.present revoke_first, so it works, should it really works?
2013-12-11 00:53:34 +01:00
regilero
5afb5619d3
Bug: Mysql revoke grants, check upper() for white list
2013-12-11 00:51:44 +01:00
regilero
02bb27866c
BUG: bad typos
2013-12-11 00:47:04 +01:00
Thomas S Hatch
650cf0fc71
Merge pull request #9148 from terminalmage/issue7990
...
Make network.interfaces work in cron where PATH is limited
2013-12-10 15:43:03 -08:00
regilero
7f55bfb454
BUG: use_unicode does not only need removal, it needs a False
2013-12-11 00:35:53 +01:00
Erik Johnson
66307b0e9b
Make salt.utils.network.linux_interfaces work in cron
2013-12-10 16:08:35 -06:00
regilero
f980c64bc4
MySQL Module: remove use_unicode connection attribute, not needed for charset managment and would create new bugs with unicode() strings
2013-12-10 23:07:13 +01:00
Erik Johnson
c0f03a3297
salt.utils.which(): use default_path if binary not found
...
To make salt.utils.which() operate well in salt-call when invoked from
cron (where PATH may be present but limited), try the paths in
default_path if the binary is not found in the search_path.
2013-12-10 16:05:02 -06:00
regilero
532796b4d2
MySQL module integration tests: grants tests and percent and _ tests
2013-12-10 22:54:45 +01:00
regilero
247fc33982
MySQL module: some percent related fixs, mostly
2013-12-10 22:52:19 +01:00
regilero
4608465600
Mysql Module: centralize call to cursor execute for logs and to undo the percent escape if no args
2013-12-10 22:51:01 +01:00
Thomas S Hatch
89e29323ec
Merge pull request #9147 from garethgreenaway/develop
...
Adding missing network functions for debian_ip.py
2013-12-10 12:29:33 -08:00
Gareth J. Greenaway
d4e2cef4e6
Merge remote-tracking branch 'upstream/develop' into develop
2013-12-10 11:56:58 -08:00
Gareth J. Greenaway
ca9197c5a7
Added missing definitions for networking setting, add and get. Changed interface parsing to use a dictionary for inet and inet6 interfaces instead of an array. Certain assumptions were made within the code on the order the ipv4 & ipv6 interfaces would appear, using a dictionary instead resolves some potential issues that could have popped up with an array. removing the tests for ip.get_network_settings and ip.build_network_settings from the exclusion.
2013-12-10 11:46:47 -08:00
Thomas S Hatch
3e23d6f0d1
Whopps! Needs to be an empty dict :)
2013-12-10 12:25:40 -07:00
Thomas S Hatch
0923aed4d3
Merge pull request #9144 from jfrost/external_ip_grain
...
new external_ip grain for salt - requires that requests be installed
2013-12-10 11:30:33 -08:00
Jeff Frost
05277cfd32
move external_ip to separate file
...
return empty dict instead of False if requests fails to import
2013-12-10 11:05:10 -08:00
C. R. Oldham
cdb6002fbe
Merge pull request #9145 from cro/develop
...
Prevent traceback when job is None.
2013-12-10 11:04:44 -08:00
C. R. Oldham
c350a28991
Prevent traceback when job is None.
2013-12-10 12:03:08 -07:00
Thomas S Hatch
f95087ed80
Merge pull request #9142 from terminalmage/quickfix
...
Fix reporting of file.blockreplace state when test=True
2013-12-10 10:57:55 -08:00
Thomas S Hatch
f689521f5d
Merge pull request #9143 from whiteinge/salt-shell
...
Initial stab at a development salt shell
2013-12-10 10:53:30 -08:00
Jeff Frost
22e4cde76a
new external_ip grain for salt - requires that requests be installed
2013-12-10 10:19:34 -08:00
Seth House
69bac1d116
Initial stab at a development salt shell
...
There is quite a bit of additional work that could be done here but this
gets things rolling at least.
Refs #3814
2013-12-10 11:09:50 -07:00
Erik Johnson
4464da4423
Fix reporting of file.blockreplace state when test=True
...
When test=True is used, this state does a dry run and doesn't change the
file (as expected), but reports that changes were made. This commit
fixes the reporting so that it states that changes would have been made.
2013-12-10 11:55:27 -06:00
Pedro Algarvio
a54ed65b79
Fix white-space related issues, and anomalous backslash.
2013-12-10 12:59:00 +00:00
Joseph Hall
426a7a8870
Merge pull request #9106 from ranl/windows_deploy_script
...
salt-cloud: ec2 cloud provider fix issue of windows minion deployment
2013-12-10 04:20:00 -08:00
Joseph Hall
2ada43ce70
Merge pull request #9137 from ranl/fix_win_deploy_minion_conf
...
fix windows deploy minion configuration
2013-12-10 04:09:54 -08:00
Pedro Algarvio
163c98fdf4
Make the regex work in Python 2.6
2013-12-10 11:11:06 +00:00
Pedro Algarvio
1341573532
Fix the SSH password regular expression.
2013-12-10 11:08:52 +00:00
Pedro Algarvio
285d825d8d
Fix white-space lint issues
2013-12-10 10:53:24 +00:00
regilero
e6d79e00f9
MySQL Module: fix on grants removal
2013-12-10 11:48:14 +01:00
regilero
70b98e8ddc
MySQL Module: Small fixs and debug on _grant_to_tokens
2013-12-10 11:47:18 +01:00
Pedro Algarvio
e45cbf1dca
Add unit test for the ssh password regex matching
2013-12-10 10:46:25 +00:00
regilero
8edbb63d97
MySQL Lint fixs
2013-12-10 11:45:47 +01:00
ranl
77b2bb2c09
salt-cloud: adding authentication validation to windows host in ec2 cloud provider
2013-12-10 11:57:05 +02:00
ranl
68214b2c50
remove spaces from cloud utils
2013-12-10 11:26:44 +02:00
ranl
d8d6de7e21
salt-cloud: enforce mandatory windows config to windows minions
2013-12-10 11:22:26 +02:00
Pedro Algarvio
8b2beacb28
Merge pull request #9135 from pengyao/memcache
...
Add __virtual__ function for memcache modules
2013-12-10 01:00:30 -08:00
Seth House
2e9985dbea
Merge pull request #9136 from pengyao/grains
...
fixed a typo about reST links
2013-12-10 00:47:59 -08:00
pengyao
444e46c134
fixed a typo about reST links
2013-12-10 15:39:49 +08:00
