valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,149 Commits 24 Branches 182 Tags 341 MiB
d6238a6e6d
Commit Graph

23149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
d6238a6e6d Merge pull request #8749 from pyinx/patch-4 
add function file.grep
 2013-12-02 10:31:23 -08:00
Thomas S Hatch
ae06ed74b3 Minor clean up on convenience rpm building function 2013-12-02 11:10:03 -07:00
Thomas S Hatch
e70b605471 Merge branch 'rpm_build_helper' of git://github.com/mbirtwell/salt into mbirtwell-rpm_build_helper 
Conflicts:
	pkg/rpm/salt.spec
 2013-12-02 11:07:59 -07:00
Joseph Hall
80913057f0 Merge pull request #8935 from jasonrm/patch-1 
Add support for refresh_db in brew
 2013-12-02 07:22:58 -08:00
Pedro Algarvio
b71e7c6ba7 Fix Lint issues. 2013-12-02 13:06:35 +00:00
Pedro Algarvio
50c9dc8fda Merge pull request #8942 from regilero/mysql_utf8 
Mysql utf8 support with tests on db names
 2013-12-02 04:36:32 -08:00
regilero
b93f1f8d02 MySQL: Add integration Tests for database names with utf8 characters 2013-12-02 12:13:10 +01:00
regilero
b5e3ef12c1 MySQL: Module: add MySQLdb use_unicode and charset connection arguments support 2013-12-02 12:09:15 +01:00
Pedro Algarvio
49e3964274 Merge pull request #8937 from malinoff/config-fixes 
Config fixes
 2013-12-02 02:42:39 -08:00
Pedro Algarvio
c3cb1b2006 Merge pull request #8939 from s0undt3ch/develop 
Hand merge @religero #8930 with Lint Fixes
 2013-12-02 02:38:15 -08:00
Pedro Algarvio
a6d0165977 Replace deprecated X.has_key(Y) syntax with Y in X. 2013-12-02 10:35:13 +00:00
Pedro Algarvio
29ee963f62 Fix Lint issues. Closes #8930. 2013-12-02 10:33:13 +00:00
Pedro Algarvio
3e53f6b6f3 Merge branch 'mysql_fix' of https://github.com/regilero/salt into regilero-mysql_fix 2013-12-02 10:12:19 +00:00
Dmitry Malinovsky
ead0cd39bf Removed unnecessary import 2013-12-02 16:18:57 +07:00
Dmitry Malinovsky
c12a04b75e PEP8 fixes 2013-12-02 16:18:27 +07:00
Jason R. McNeil
7ad966b1fa Add support for refresh_db in brew 
It appears that refresh_db became a feature that package managers are require to support as `KeyError: 'pkg.refresh_db'` was the error I was getting before this commit. I've not had a chance to fully test this fix, so I'd appreciate anyone else taking a look at this.
 2013-12-01 22:44:39 -07:00
Pedro Algarvio
343dc98025 Merge pull request #8931 from terminalmage/pkg-state-reporting 
Fix pkg.installed state summary reporting
 2013-12-01 08:59:41 -08:00
Erik Johnson
ba556efee7 Fix pkg.installed state summary reporting 
In 03e4e8a the pkg.installed state was altered to not show all the
package names that were modified if a lot of them were changed, and
instead just mention the number of packages that changed. However, the
number that is being reported is the length of the string result of
commaspace-joining the list of modified package names. This results in
incorrect output. This commit fixes that reporting issue.
 2013-12-01 10:50:38 -06:00
regilero
f5ea59df83 BUG: MySQL integration tests: false positive on accents with assertTrue, use assertEqual instead and comment accents tests 2013-12-01 17:11:37 +01:00
regilero
a2cd33dec7 MySQL: Add cli example for quoteIdentifier function 2013-12-01 17:08:17 +01:00
regilero
69fe9eb27d MySQL: Module integration tests for maintenance tasks check/repair/optimize 2013-12-01 15:27:47 +01:00
Joseph Hall
2f70ec9a79 Merge pull request #8928 from techhat/deploy 
Add explanatory comments to legacy deploy scripts
 2013-12-01 06:26:58 -08:00
Joseph Hall
39ee74de07 Add explanatory comments to legacy deploy scripts 2013-12-01 07:24:36 -07:00
Joseph Hall
7d2f6b408a Merge pull request #8924 from shadowfax-chc/portage_config_ignore_comments 
Skip comments in existing configs when using `portage_config.enforce_nice_config`
 2013-12-01 06:12:47 -08:00
regilero
b85d51f746 ySQL: make _quoteIdentifier method public 2013-12-01 11:04:06 +01:00
regilero
772144af8a MySQL unit tests, make the examples more complex 2013-12-01 10:43:13 +01:00
regilero
bab4dda396 MySQL: Add some more robust code on check_table,repair_table and optimize_table 2013-12-01 10:42:25 +01:00
shadowfax-chc
f9dffeb392 Skip comments in existing configs when using portage_config.enforce_nice_config 2013-12-01 03:11:48 -05:00
Thomas S Hatch
0698960d21 Merge pull request #8923 from joehealy/doc_warning_fixes 
Doc fixes to remove errors and warnings
 2013-11-30 23:51:30 -08:00
Thomas S Hatch
384e8fa2b6 Merge pull request #8894 from kaithar/feature/highstate-output-docs 
Add information about the undocumented changes output mode
 2013-11-30 23:47:31 -08:00
Joe Healy
45525b4b59 Doc fixes to remove errors and warnings 2013-12-01 18:29:16 +11:00
Pedro Algarvio
3cd5efe521 Merge pull request #8922 from terminalmage/tests 
add test for #8614
 2013-11-30 20:03:43 -08:00
Erik Johnson
093065b130 add test for #8614 2013-11-30 22:00:05 -06:00
Pedro Algarvio
a14abd114c Merge pull request #8921 from terminalmage/issue8614 
Fix installation of packages with dots in pkg name
 2013-11-30 19:47:30 -08:00
Erik Johnson
f1bb4b45db Fix installation of packages with dots in pkg name 
This commit fixes a regression which caused packages with dots in the
package name to fail to install. Resolves #8614.
 2013-11-30 21:35:42 -06:00
Pedro Algarvio
d0cf058e24 Merge pull request #8920 from s0undt3ch/develop 
Left behind comits. Lint Fixes.
 2013-11-30 17:37:57 -08:00
regilero
dacda7e0ca Add an example on mysql.grant_to_token method to fix travis test_valid_docs failure 2013-12-01 01:35:41 +00:00
regilero
95a41bdb9a MySQL integration tests on module level unicode support 2013-12-01 01:35:41 +00:00
Pedro Algarvio
923428c68b Fix PyLint issues. 2013-12-01 01:35:41 +00:00
Pedro Algarvio
11210ca180 Merge pull request #8919 from s0undt3ch/develop 
Hand merge @religero PR
 2013-11-30 17:24:23 -08:00
Pedro Algarvio
6321bf4acc Pass the timelib testing optional requirement to the new opt reqs file. Closes #8900. 2013-12-01 00:42:02 +00:00
Pedro Algarvio
c129d3f567 Remove packages installation from mysql tests and push that on travis yml with an opt_requirements.txt source 2013-12-01 00:34:58 +00:00
regilero
1556a3f2c6 Fix mysql unit tests for queries with parameters 2013-12-01 00:34:30 +00:00
regilero
b97d8cc623 Minor pylint fixs 2013-12-01 00:34:30 +00:00
regilero
05c02c4c50 Try to install python-mysql in travis env via pip to enable MySQL module 2013-12-01 00:34:30 +00:00
regilero
b5f588a9fc Initial MySQL integration test with MySQl packages installed 2013-12-01 00:34:29 +00:00
regilero
1cb5d6374a Fix MySQl db names management, and add collate and character set on db_create 2013-12-01 00:34:29 +00:00
regilero
d3cdb68a37 Initial MySQL integration test with MySQl packages installed 2013-12-01 00:34:29 +00:00
regilero
1319755c55 Fix typo in mysql unit test 2013-12-01 00:34:29 +00:00
Pedro Algarvio
4e6a1c4d7d Merge pull request #8918 from techhat/cloudcreate 
Allow creating instances without profiles
 2013-11-30 13:20:15 -08:00