Mathieu Le Marec - Pasquet
bbb3f9494c
do not expose exceptions
2013-12-04 01:51:50 +00:00
Mathieu Le Marec - Pasquet
50cdd562ad
make buildout test more robust
2013-12-04 01:51:23 +00:00
Mathieu Le Marec - Pasquet
ee820545e4
buildout fixes from 996c7950cc
2013-12-04 01:51:23 +00:00
Joseph Hall
29b76829af
Merge pull request #9005 from makinacorpus/lint-fixes
...
Lint fixes
2013-12-03 17:08:15 -08:00
Mathieu Le Marec - Pasquet
7d299f9c0f
pylint fixes
2013-12-04 00:25:56 +00:00
Mathieu Le Marec - Pasquet
5f46962e80
pep8 fixes
2013-12-04 00:25:50 +00:00
Chris Rebert
e8da05a72f
make zcbuildout._Logger a new-style class
...
salt/modules/zcbuildout.py:106: [C1001(old-style-class), _Logger] Old-style class defined.
2013-12-03 15:48:33 -08:00
Seth House
e947d81f50
Merge pull request #9000 from basepi/showslsnote
...
Add note about topfiles to state.show_sls
2013-12-03 15:45:26 -08:00
Colton Myers
f4d10d9a03
Add note about topfiles to state.show_sls
2013-12-03 16:42:32 -07:00
Chris Rebert
651e27d9a9
cp mod: honor env argument in list_master() & hash_file()
...
************* Module salt.modules.cp
salt/modules/cp.py:441: [W0613(unused-argument), list_master] Unused argument 'env'
salt/modules/cp.py:548: [W0613(unused-argument), hash_file] Unused argument 'env'
2013-12-03 15:39:43 -08:00
Chris Rebert
d8c26763ae
modules.lvs: use alias to avoid shadowing list built-in type
...
salt/modules/lvs.py:353: [W0622(redefined-builtin), list] Redefining built-in 'list'
2013-12-03 15:27:37 -08:00
Chris Rebert
af601e2202
rm unused import from zcbuildout state
...
salt/states/zcbuildout.py:41: [W0611(unused-import), ] Unused import re
2013-12-03 15:23:06 -08:00
Ollie Walsh
68e0e3a106
Add unit test for event timeouts
2013-12-03 22:44:52 +00:00
Erik Johnson
0bd2f6c06e
Allow editable=. for pip.install
2013-12-03 15:58:27 -06:00
Thomas S Hatch
a6c080c226
The saltenv changes caused a break with older minions when gathering
...
pillar
2013-12-03 14:24:47 -07:00
Samuel M Smith
e32d6f8eeb
Merge remote-tracking branch 'upstream/develop' into sam_20131202
2013-12-03 14:19:18 -07:00
Thomas S Hatch
7e80ee031a
Merge pull request #8963 from mgwilliams/ps
...
ps module: add get_users
2013-12-03 12:46:45 -08:00
Thomas S Hatch
0acd1eea5c
Include the exec_info for virtual function exceptions
2013-12-03 13:34:50 -07:00
Pedro Algarvio
de707db3c6
Merge pull request #8986 from s0undt3ch/hotfix/jenkins
...
Lint Fixes
2013-12-03 12:32:23 -08:00
Pedro Algarvio
877bdb2a90
Lint white-space fixes.
2013-12-03 20:30:16 +00:00
Pedro Algarvio
a7365b6322
No last line
2013-12-03 20:28:41 +00:00
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
