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,256 Commits 24 Branches 182 Tags 341 MiB
a6c080c226
Commit Graph

23256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Delaby
6d30a1df78 ExposedPort should be a mapping, not a list 
According to http://docs.docker.io/en/latest/api/docker_remote_api_v1.6/#create-a-container ,
the API version that introduce ExposedPort parameter, the value of ports should be a dict and not a list.

Note that the value has no effect, only the keys. This is why an empty dict is given as value.
Also when using api 1.4, ports is ignored, this is why docker didn't complain so far.
 2013-12-03 14:32:27 +01:00
Christophe Vedel
0db02824e5 Fix for issue #8945 2013-12-03 12:36:27 +01:00
Joseph Hall
dc3e068838 Merge pull request #8970 from s0undt3ch/issues/8967-pip-no-deps 
Allow passing `--no-deps` to pip. Fixes #8967.
 2013-12-03 03:07:52 -08:00
Pedro Algarvio
9edd8c868d Allow passing --no-deps to pip. Fixes #8967. 2013-12-03 10:38:07 +00:00
Pedro Algarvio
449263b5cf Merge pull request #8969 from s0undt3ch/develop 
Lint Fixes
 2013-12-03 02:17:55 -08:00
Pedro Algarvio
7663921d6b Two spaces before in-line comment. 2013-12-03 10:17:16 +00:00
Pedro Algarvio
153be5ddca Remove trailing white-space. 2013-12-03 10:16:55 +00:00
Pedro Algarvio
3abe85d181 Boolean and None comparisons should be done with is not ==. 2013-12-03 10:14:55 +00:00
Jorge-Rodriguez
25573412d4 Added ssl verify flag to the gitfs backend. 2013-12-03 09:54:47 +02:00
Matthew Williams
2188c5bb00 ps module: add get_users 2013-12-03 03:06:29 +00:00
Kaithar
9e2bfd1745 Cleaner output for highstate full 2013-12-03 02:56:46 +00:00
Pedro Algarvio
86c8a5c49b Merge pull request #8960 from techhat/cloudstate 
Minor fix and clarification for cloud states
 2013-12-02 18:06:42 -08:00
Ollie Walsh
8bacb953c0 Fix typo 2013-12-03 01:45:18 +00:00
Ollie Walsh
d81aeb2c0e More tests 2013-12-03 01:22:51 +00:00
Ollie Walsh
ed0c689939 Fix issue #8580 2013-12-03 01:22:43 +00:00
Joseph Hall
438f5afb9c Copy/paste error fixed 2013-12-02 18:13:17 -07: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
Ollie Walsh
f9aca16aee More unit tests and longer timeouts for travis-ci 2013-12-02 23:20:54 +00: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
Ollie Walsh
6fe85f1294 Add some basic unit tests for events 2013-12-02 22:26:13 +00: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
Joseph Hall
47a67d35e0 Clarify stateful usage of cloud.present and cloud.profile 2013-12-02 12:44:57 -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
Mathieu Le Marec - Pasquet
88a63602eb Remove unused code 2013-12-02 13:48:15 +00:00
Mathieu Le Marec - Pasquet
9bcea05010 Remove obsolete test 2013-12-02 13:42:34 +00: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