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,184 Commits 24 Branches 182 Tags 341 MiB
9e2bfd1745
Commit Graph

23184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kaithar
9e2bfd1745 Cleaner output for highstate full 2013-12-03 02:56:46 +00:00
Thomas S Hatch
bb45f1c403 Merge pull request #8957 from cachedout/#7001 
Fast-fail for down master when authenticating
 2013-12-02 15:49:16 -08:00
Thomas S Hatch
893a2f6b10 Merge pull request #8958 from terminalmage/issue8226 
Make Amazon Linux use yumpkg5 provider
 2013-12-02 15:46:16 -08:00
Erik Johnson
7a3c56c4fa Make Amazon Linux use yumpkg5 provider 
Due to a bug in the rpm python API, Amazon Linux is unable to retrieve
repo metadata over SSL connections. This commit forces Amazon Linux to
use yumpkg5 while we decide what to do about this.

See the following comment from the issue tracker for more info:
https://github.com/saltstack/salt/issues/8226#issuecomment-29664936
 2013-12-02 17:26:33 -06:00
Mike Place
f41dfe0e41 Modify the sign_in function to first check to see if a TCP connection can be established to the master. If not, fail immediatley instead of waiting for the default timeout of 60 seconds. Refs #7001. 2013-12-02 16:09:26 -07:00
Thomas S Hatch
39a032d87b Merge pull request #8955 from SmithSamuelM/sam_retsuccess 
Fixed runner and wheel clients to match new returner semantics when exce...
 2013-12-02 14:18:46 -08:00
Thomas S Hatch
efc267531b Merge pull request #8954 from cachedout/unit-test-docs 
Unit-testing documentation.
 2013-12-02 14:18:26 -08:00
Thomas S Hatch
549e87b446 Merge pull request #8952 from SmithSamuelM/sam_cloud 
Bandaid fix to race condition with runner proc_runner and event push pul...
 2013-12-02 14:16:10 -08:00
Samuel M Smith
5c01c3a176 Fixed runner and wheel clients to match new returner semantics when exceptions occur 2013-12-02 14:57:00 -07:00
Mike Place
3a4b6c8fa6 Unit-testing documentation. 2013-12-02 14:34:16 -07:00
Samuel M Smith
9c54d87bac Bandaid fix to race condition with runner proc_runner and event push pull ZeroMQ socket 
Fix is to add sleep after last fire event so that the runner process is not reaped until after
the event has made it out of the push socket. This is a bandaid because it does not guarantee
to work if the event process is slow and does not process the event before the sleep expires.

Added a timeout to the fire event and push socket so the send call blocks until the message is sent
Also upped the Linger timeout  but neither of these work because of how the process is getting reaped

A better solution is to change how the process is reaped so that linger and timeout will work.

The best solution is to use a req rep socket so there is positive confirmation that the event
made it.
 2013-12-02 14:12:19 -07:00
Thomas S Hatch
2fecfab878 Merge branch 'feature/tabular-highstate' of git://github.com/kaithar/salt into kaithar-feature/tabular-highstate 
Conflicts:
	salt/output/highstate.py
 2013-12-02 12:07:48 -07:00
Thomas S Hatch
17aad1c06c Merge pull request #8950 from techhat/cloudstate 
Add cloud.absent state
 2013-12-02 11:12:48 -08:00
Thomas S Hatch
0d7c08ee05 Merge pull request #8944 from olliewalsh/issue_8941 
Fix issue #8941
 2013-12-02 11:12:18 -08:00
Thomas S Hatch
cd25ae61f1 Merge pull request #8936 from Jorge-Rodriguez/develop 
Added SSL verify flag for pillar git backend.
 2013-12-02 11:10:15 -08:00
Pedro Algarvio
3bd204273f Merge pull request #8949 from s0undt3ch/develop 
Fix spacing lint issues.
 2013-12-02 10:49:24 -08:00
Joseph Hall
1ff9df79de Add cloud.absent state 2013-12-02 11:49:21 -07:00
Pedro Algarvio
bc7266ff37 Fix spacing lint issues. 2013-12-02 18:48:51 +00:00
mlister2006
771eb8f97b ONPARENT= no/yes , option support RHEL network management 
Adding support for additional option
e.g:
 ONPARENT = no
for RHEL based OS network management.
 2013-12-02 11:41:20 -07:00
Thomas S Hatch
96c4def730 Merge pull request #8818 from gotvach/issue-8590 
wrap file copy in umasks to secure permissions
 2013-12-02 10:37:14 -08:00
Thomas S Hatch
2918ac4209 Merge pull request #8801 from s0undt3ch/hotfix/deprecate-salt-cloud-config-file 
Deprecate salt cloud split config files to CLI tool
 2013-12-02 10:36:14 -08:00
Thomas S Hatch
725709b7f3 Add note about future changes to file.grep 2013-12-02 11:26:51 -07:00
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
Ollie Walsh
828763317a Fix issue #8941 2013-12-02 11:38:02 +00: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
Jorge-Rodriguez
ddf4c6dbe2 Added SSL verify flag for pillar git backend, in case getting around 
self-signed certificates is needed.
 2013-12-02 10:40:11 +02: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