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

23404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
205ed46577 Easier path building 2013-12-03 20:28:08 +00:00
Pedro Algarvio
d6d2993486 No un-indexed curly braces on string .format() calls 2013-12-03 20:24:21 +00:00
Matthew Williams
ca6d372416 Merge branch 'develop' into ps 
Conflicts:
	salt/modules/ps.py
 2013-12-03 20:12:21 +00:00
Thomas S Hatch
9c100b980f Just send to the top for __SUFFIX_NOT_NEEDED 2013-12-03 13:04:34 -07:00
Thomas S Hatch
996c7950cc Fix bare exception 2013-12-03 12:52:13 -07:00
Thomas S Hatch
6aa1416c36 lint 2013-12-03 12:51:22 -07:00
Thomas S Hatch
73b43a37af statically assign suffix not needed 2013-12-03 12:49:00 -07:00
Thomas S Hatch
df6199bb9f pylint 2013-12-03 12:45:03 -07:00
Thomas S Hatch
42651babd8 don't expose the Logger class to the loader 2013-12-03 12:37:09 -07:00
Pedro Algarvio
c3f504feda Merge pull request #8983 from terminalmage/issue7432 
Make ps execution module available for psutil>=0.3.0
 2013-12-03 11:33:39 -08:00
Erik Johnson
3e336eb659 Cleanup version comparison 
Tuple comparison is cleaner, hat-tip to pedro :)
 2013-12-03 13:28:30 -06:00
Samuel M Smith
9fafbb95b3 Merge remote-tracking branch 'upstream/develop' into sam_20131202 2013-12-03 12:21:28 -07:00
Erik Johnson
551dfa9223 Make ps execution module available for psutil>=0.3.0 
After looking at some of the older source code versions, it seems that
the majority (if not all) of the features present in the ps execution
module became available between psutil release 0.2.0 and 0.3.0. This
commit removes the python version check in the __virtual__ function, and
replaces it with a check of the psutil version. Only psutil versions
greater than or equal to 0.3.0 will result in the ps execution module
being available.
 2013-12-03 13:14:46 -06:00
Thomas S Hatch
85e446abc3 just use an else 2013-12-03 12:10:40 -07:00
Thomas S Hatch
c3a52b927c Merge pull request #8981 from cachedout/#8717 
Avoid conflicting options.
 2013-12-03 11:14:29 -08:00
Thomas S Hatch
ef40793106 Merge pull request #8982 from s0undt3ch/hotfix/salt-cloud-merge 
Missed `vm_config` to `profiles_config` and tests
 2013-12-03 11:13:50 -08:00
Pedro Algarvio
13a9effdaf Add unit tests regarding include.d directories loading. 2013-12-03 19:08:30 +00:00
Thomas S Hatch
d8de8dd3aa Add another not 2013-12-03 12:06:46 -07:00
Thomas S Hatch
0ae19d12a9 Fix stack trace in event fixes 2013-12-03 12:06:46 -07:00
Thomas S Hatch
b710fbb759 @kiorky please finish cleaning up the double quotes sometime 
It is nice to keep the style clean, also, do we need the Logger
class? why can't we just use the salt logging? or am I missing
something?
 2013-12-03 12:06:46 -07:00
Thomas S Hatch
4e377c1cf3 lint fixes 2013-12-03 12:06:46 -07:00
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