Commit Graph

23294 Commits

Author SHA1 Message Date
Matt Hopkins
edad7246df Fix for unknown version numbers when installing windows packages 2013-12-05 10:23:40 -05:00
Matt Hopkins
9718126a32 Support to appending node specific extra_install_flags to windows packages 2013-12-04 21:00:14 -05:00
Pedro Algarvio
7442158364 Merge pull request #9027 from terminalmage/issue9002
Pass through "env" in cmd.script
2013-12-04 14:52:47 -08:00
Erik Johnson
acd3a8d8ee Pass through "env" in cmd.script
Fixes #9002.
2013-12-04 16:42:16 -06:00
C. R. Oldham
d6ea8a0c0d Merge pull request #9029 from erjohnso/develop
Have to rely on source install of libcloud for now.
2013-12-04 12:22:31 -08:00
C. R. Oldham
c14679ddae Merge pull request #9030 from cro/fix_8698
Be more liberal about the format of the key we are looking for.
2013-12-04 12:10:35 -08:00
C. R. Oldham
d188939b14 Be more liberal about the format of the key we are looking for. (e.g. accept 'ssh-rsa AAB3NzaC... comment' as well as just 'AAB3NzaC...') 2013-12-04 13:07:15 -07:00
Eric Johnson
9256e92e8e small issue in libcloud, need to install from source for now 2013-12-04 19:44:30 +00:00
C. R. Oldham
66d34c979c Merge pull request #9026 from cro/develop
Return False if Postgres role create or role update fails.
2013-12-04 11:18:46 -08:00
C. R. Oldham
ed5925c678 Return False if the role update fails (return value would be nonzero). 2013-12-04 12:16:22 -07:00
C. R. Oldham
5bf728343d Return False if the role creation fails (return value would be nonzero). Fixes #8778. 2013-12-04 12:13:36 -07:00
Pedro Algarvio
dc434ae1a5 Merge pull request #9017 from techhat/nodequery
Allow single-provider node queries using -f
2013-12-04 04:48:56 -08:00
Joseph Hall
f7785ad8f8 Remove code that was inadvertantly added too early 2013-12-04 05:46:49 -07:00
Joseph Hall
73ccda897e Disable pylint warnings about unused call variable 2013-12-04 05:44:50 -07:00
Joseph Hall
383a35d6a6 Allow single-provider node queries using -f 2013-12-04 05:09:20 -07:00
Pedro Algarvio
e39d5490b9 Merge pull request #9016 from techhat/typo
Fix misleading message in disk monitoring state
2013-12-04 03:53:29 -08:00
Joseph Hall
86ff76b39e Fix misleading message 2013-12-04 04:50:16 -07:00
Pedro Algarvio
b1e7888a84 Merge pull request #8999 from hulu/cp-env
cp mod: honor `env` argument in list_master() & hash_file()
2013-12-04 02:50:37 -08:00
Pedro Algarvio
2a2e3ad77b Merge pull request #9003 from cvrebert/patch-2
make zcbuildout._Logger a new-style class
2013-12-04 02:48:32 -08:00
Pedro Algarvio
4a5c10f296 Merge pull request #9007 from cachedout/postgres-unit-tests
First-pass unit test coverage for the Postgres execution module.
2013-12-04 02:47:41 -08:00
Pedro Algarvio
be6f93202d Merge pull request #9004 from makinacorpus/buildout-fixes
buildout fixes from 996c7950cc
2013-12-04 02:46:44 -08:00
Pedro Algarvio
b48edc9e01 Merge pull request #9009 from cachedout/#8972
Refactor to no longer shadow built-ins of min and max
2013-12-04 02:43:44 -08:00
Mike Place
28f0e7e6f7 Refactor to no longer shadow built-ins of min and max 2013-12-03 22:47:57 -07:00
Joseph Hall
00faa5f002 Merge pull request #8997 from hulu/lvs-list-alias
modules.lvs: use alias to avoid shadowing `list` built-in type
2013-12-03 18:39:12 -08:00
Mike Place
6d4a422c20 First-pass unit test coverage for the Postgres execution module. 2013-12-03 19:00:26 -07:00
Mathieu Le Marec - Pasquet
e59e8274fb fix doc handling 2013-12-04 01:51:51 +00:00
Mathieu Le Marec - Pasquet
e7f096d222 more doc for buildout 2013-12-04 01:51:51 +00:00
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
Thomas S Hatch
a6c080c226 The saltenv changes caused a break with older minions when gathering
pillar
2013-12-03 14:24:47 -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