Mike Place
da9cd50ac7
Avoid conflicting options.
...
If you're a superuser, you already have permissions to create a user. Postgres will complain about conflicting options if you attempt to pass both. Refs #8717 .
2013-12-03 12:03:43 -07:00
Pedro Algarvio
2f0fc07688
Some more missed vm_config to profiles_config missed occurrences.
2013-12-03 18:58:57 +00:00
Samuel M Smith
51a1106167
Merge remote-tracking branch 'upstream/develop' into sam_20131202
2013-12-03 11:58:28 -07:00
Thomas S Hatch
cba974acb9
Merge pull request #8980 from hulu/snake_case-not-camelCase
...
fix naming of modules.mysql.quoteIdentifier() to follow convention
2013-12-03 10:54:59 -08:00
Chris Rebert
d91851a479
fix naming of modules.mysql.quoteIdentifier() to follow convention
2013-12-03 10:42:24 -08:00
Pedro Algarvio
63cb0571c1
Skip temporary files.
2013-12-03 18:38:53 +00:00
Thomas S Hatch
f82e3a859b
Merge pull request #8978 from s0undt3ch/develop
...
Missed one step when renaming `vm_config` to `profiles_config`.
2013-12-03 10:35:15 -08:00
Pedro Algarvio
2339998e7b
Missed one step when renaming vm_config to profiles_config.
2013-12-03 18:32:14 +00:00
Thomas S Hatch
be00384a82
Merge pull request #8977 from s0undt3ch/develop
...
Minor doc updates
2013-12-03 10:12:44 -08:00
Thomas S Hatch
d5d6f6b921
Merge pull request #8973 from ticosax/fix-exposed-port-parameter
...
ExposedPort should be a mapping, not a list
2013-12-03 10:09:10 -08:00
Thomas S Hatch
f4aafb8eb4
Merge pull request #8971 from cvedel/issue_8945
...
Fix for issue #8945
2013-12-03 10:07:15 -08:00
Thomas S Hatch
adb77ce298
Catch os.error instead of all Exceptions
2013-12-03 10:55:59 -07:00
Thomas S Hatch
2b9048a8c6
Merge pull request #8966 from Jorge-Rodriguez/develop
...
Added ssl verify flag to the gitfs backend.
2013-12-03 10:00:51 -08:00
Thomas S Hatch
77d61d92a4
Merge pull request #8914 from makinacorpus/issue-8856-buildout-support
...
feat: buildout support
2013-12-03 09:56:59 -08:00
Mathieu Le Marec - Pasquet
3a55194ba6
lint fix
2013-12-03 17:56:50 +00:00
David Boucha
06a622cf67
Merge pull request #8934 from Geo23589/Issue8827
...
Fixed chown() and chgrp()
2013-12-03 09:55:02 -08:00
Mathieu Le Marec - Pasquet
e9246d2a77
Remove bootstrap.py's & adapt tests for zcbuildout module
2013-12-03 17:53:58 +00:00
Thomas S Hatch
cb35005848
Merge pull request #8962 from kaithar/feature/full-highstate-cleaning
...
Cleaner output for highstate full
2013-12-03 09:49:46 -08:00
Pedro Algarvio
e4c53a6261
Don't wrap.
2013-12-03 17:32:35 +00:00
Pedro Algarvio
c208b7d5d9
Doc strings should be narrower.
2013-12-03 17:29:58 +00:00
Pedro Algarvio
60bcaeb6b4
Minor formatting, accuracy, spelling.
2013-12-03 17:29:58 +00:00
Thomas S Hatch
f07150c4b8
Merge pull request #8961 from olliewalsh/eventfix
...
Fix issue #8580
2013-12-03 09:27:27 -08:00
Mathieu Le Marec - Pasquet
30511257a8
add requires_network for buildout test
2013-12-03 16:51:46 +00:00
Thomas S Hatch
fa55193d02
Can't send more args into the multiprocess run method
2013-12-03 09:43:18 -07:00
Matthew Williams
2e5c3162ef
ps: optional usage of utmp python module for get_users
2013-12-03 16:34:36 +00:00
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
Samuel M Smith
08fbea2eca
Merge remote-tracking branch 'upstream/develop' into sam_20131202
2013-12-02 16:07:27 -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
