regilero
70b98e8ddc
MySQL Module: Small fixs and debug on _grant_to_tokens
2013-12-10 11:47:18 +01:00
regilero
8edbb63d97
MySQL Lint fixs
2013-12-10 11:45:47 +01:00
regilero
2dc7d80786
MySQL: Module: user_grants tests
2013-12-09 20:48:36 +01:00
regilero
da86402172
MySQL: Module: fix user_grant tokens generation
2013-12-09 20:47:54 +01:00
regilero
578e2b29dc
BUGFIX: MySQL: grant result may not contain IDENTIFIED BY, bug would double WITH GRANT OPTION
2013-12-09 16:29:57 +01:00
regilero
941e500268
BUGFIX: MySQL: missing connection arguments in user_remove's user_exists check
2013-12-09 16:29:02 +01:00
regilero
dc615426e7
BUG: white list filtering of grants
2013-12-09 16:27:26 +01:00
regilero
6c0b53547d
MySQl: fix states integration tests
2013-12-08 17:10:37 +01:00
regilero
66b6ac31a7
MySQL module test: test conn except for utf-8 db names
2013-12-08 16:37:45 +01:00
regilero
d419620ecd
Lint fixs
2013-12-06 15:58:54 +01:00
regilero
a59d47bc9e
Merge remote-tracking branch 'upstream/develop' into mysql_additions
2013-12-06 10:53:32 +01:00
Thomas S Hatch
870f150129
Merge pull request #9048 from holmboe/patch-1
...
Avoid line continuation
2013-12-05 23:13:04 -08:00
Thomas S Hatch
537df714af
Merge pull request #9045 from olenz/develop
...
If a specific repo is requested, force the installation.
2013-12-05 23:10:54 -08:00
Thomas S Hatch
69dc9f7e1c
Merge pull request #9040 from s0undt3ch/issues/8447-timeout-from-configfile-not-respected
...
Update the parser options with values from config file. Fixes #8447 .
2013-12-05 23:05:03 -08:00
Thomas S Hatch
edb4f9d995
Merge pull request #9015 from cowyn/develop
...
Added exception handler for git repo init
2013-12-05 23:04:02 -08:00
David Boucha
20ebfe3521
Merge pull request #9041 from thematthopkins/windows_install_flags
...
Support to appending node specific extra_install_flags to windows packag...
2013-12-05 17:03:23 -08:00
David Boucha
3a34b64d20
Merge pull request #9022 from thematthopkins/develop
...
switches paths to state files to use forwardslashes on masterless window...
2013-12-05 17:02:07 -08:00
David Boucha
e3aa0b8103
Merge pull request #9064 from UtahDave/develop
...
add a space to satisfy pylint
2013-12-05 16:57:02 -08:00
David Boucha
bea7bc01d5
add a space to satisfy pylint
2013-12-05 17:56:14 -07:00
Thomas S Hatch
01387050f5
Merge pull request #9063 from cachedout/#6764
...
Wrap highstate.cache.p in restrictive umask.
2013-12-05 16:33:58 -08:00
Mike Place
7404f15af9
Wrap highstate.cache.p in restrictive umask.
2013-12-05 17:21:44 -07:00
David Boucha
0f806796bc
Merge pull request #9062 from UtahDave/develop
...
namespace file_exists in win_file.py
2013-12-05 15:50:27 -08:00
David Boucha
06d8f7fc7f
namespace file_exists
2013-12-05 16:48:51 -07:00
Thomas S Hatch
6cd183b690
Merge pull request #9020 from ouiea/fix-gem-rvm-with-another-user
...
Fixes issue #8951 - gem install fails when rvm is set up with another us...
2013-12-05 13:51:01 -08:00
Pedro Algarvio
b5513395f3
Don't rely on salt.utils.is_windows(), it fails at install time under windows.
2013-12-05 20:54:33 +00:00
Pedro Algarvio
9226f98bfe
Let's include Salt Cloud to avoid circular import issues in Windows.
2013-12-05 20:46:35 +00:00
Thomas S Hatch
d135dc0239
Merge pull request #9019 from blackduckx/develop
...
Support Oracle Linux 5.x
2013-12-05 12:05:50 -08:00
pyinx
7c20dd12b2
add saltstack state: memcached
2013-12-05 12:44:07 -07:00
pyinx
8e4345266a
add saltstack module: memcached
2013-12-05 12:44:00 -07:00
linuxme
fd074dc57e
Update mysql.py
...
change ' to `
2013-12-05 12:43:55 -07:00
linuxme
9c75f6c848
Update mysql.py
...
modify ''alter_time' TIMESTAMP DEFAULT CURRENT_TIMESTAMP' to ''alter_time' TIMESTAMP DEFAULT CURRENT_TIMESTAMP,'
2013-12-05 12:43:48 -07:00
linuxme
84da3ab2ac
Update mysql.py
...
added the 'alter_time' column to the table 'salt_returns'
This column is convenient for us filtering SQL statements in a given time period and help us determine whether a statement execution success on some minions.
2013-12-05 12:43:41 -07:00
Thomas S Hatch
018a2d9c99
Merge pull request #9011 from Jorge-Rodriguez/develop
...
Catch os.error instead of all Exceptions
2013-12-05 11:44:28 -08:00
Thomas S Hatch
f65887cbda
Merge pull request #8993 from olliewalsh/eventtest
...
Another unit test for events
2013-12-05 11:39:33 -08:00
Thomas S Hatch
4fb92c78c9
Merge pull request #9054 from SmithSamuelM/sam_20131202
...
Enable manage.present to work on non linux but unix os like os x where /proc is not available
2013-12-05 11:39:19 -08:00
Thomas S Hatch
2c92aab445
Merge pull request #8991 from terminalmage/issue5392
...
Allow editable=. for pip.install
2013-12-05 11:38:21 -08:00
David Boucha
2bbad9a259
Merge pull request #9056 from s0undt3ch/develop
...
Don't trigger the name resolution at import time. Fixes install on Windows machines.
2013-12-05 11:26:10 -08:00
Pedro Algarvio
fcdf6473b7
Don't trigger the name resolution at import time. Fixes install on Windows machines.
2013-12-05 19:18:33 +00:00
Samuel M Smith
58aca6e5ff
Added fallback to manage.present to use lsof to get open connections for oses where /proc is not available
...
This allows manage.present to work on non linux but unix oses.
2013-12-05 11:03:13 -07:00
Colton Myers
ffc85bcb4f
Merge pull request #9050 from basepi/pillarincludedocs
...
Fix pillar include example
2013-12-05 08:35:41 -08:00
Colton Myers
5b90e371ce
Fix pillar include example
...
Fixes #9034
2013-12-05 09:33:51 -07:00
Henrik Holmboe
8799c1fa8f
Avoid line continuation
2013-12-05 17:15:04 +01:00
Cowyn Li
510ded748c
A new approach for working with fileserver backend for git_pillar module
2013-12-05 23:40:45 +08:00
Matt Hopkins
edad7246df
Fix for unknown version numbers when installing windows packages
2013-12-05 10:23:40 -05:00
Olaf Lenz
b4de47d524
Fix to #8816
2013-12-05 16:19:39 +01:00
Olaf Lenz
d69c9de302
Add parameter "backupname" to file.symlink.
2013-12-05 15:53:11 +01:00
Cowyn Li
c24852c9f4
Merge remote-tracking branch 'upstream/develop' into develop
2013-12-05 22:51:19 +08:00
Olaf Lenz
4c3b91df50
If a specific repo is requested, force the instalation. Otherwise, zypper asks interactively whether the vendor is to be changed.
2013-12-05 14:57:33 +01:00
Joseph Hall
17ca2aeac2
Merge pull request #9024 from cachedout/#8976
...
Grains detection for LXC and fix error in disk.usage under Docker
2013-12-05 04:34:15 -08:00
Joseph Hall
ee06057dc7
Merge pull request #9025 from terminalmage/issue8720
...
Keep pid of salt CLI command from showing in status.pid output
2013-12-05 04:32:09 -08:00
