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
Mike Place
e6e0a7d919 Integration testing for #8976 2013-12-04 12:34:20 -07: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
Erik Johnson
6a39fa4191 Keep pid of salt CLI command from showing in status.pid output 
When status.pid is executed by the salt-minion instance running on the
master, it also returns the pid of the salt CLI command, because the
search string matches. This commit adds another grep to the ps/grep/awk
one-liner, which filters out lines matching 'status.pid'.
 2013-12-04 12:39:59 -06:00
Mike Place
430df4c4e1 Grains detection for LXC and fix error in disk.usage under Docker 
I have modified the core grains detection routines where dragons often lay, so this should be reviewed carefully.

I have elected to set the LXC detection inside virtual_subtype for account for cases wherein a user might be running inside VirtualBox (as the tutorial for Docker leads one to do). Moreover, I also allow the virtualization detection to continue after LXC is detected, as I believe it may even be possibly for Xen and LXC to co-exist. (Though, let's be honest -- probably not recommended!)

Finally, disk.usage now correctly fails with a warning message and includes a work-around for gathering disk usage under Docker containers. This refs #8976.
 2013-12-04 11:18:15 -07:00
Samuel M Smith
cd1e587d65 Added debug 2013-12-04 10:42:44 -07:00
Samuel M Smith
e4693881ff Merge remote-tracking branch 'upstream/develop' into sam_20131202 2013-12-04 10:41:07 -07:00
Matt Hopkins
a817ca9aa3 switches paths to state files to use forwardslashes on masterless windows 2013-12-04 11:56:16 -05:00
ouiea
2ad4fd5107 Fixes issue #8951 - gem install fails when rvm is set up with another user 2013-12-04 12:11:08 -03:00
Frédéric Brin
b9ea313b91 Support Oracle Linux 5.x 
Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.

This one line fix solves this issue.

For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
 2013-12-04 15:50:49 +01: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
Cowyn Li
ff1d58f342 Added exception handler for git repo init 2013-12-04 17:36:46 +08:00
Jorge-Rodriguez
c8e54c8a0a Catch os.error instead of all Exceptions 2013-12-04 09:32:10 +02: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
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