Aaditya Talwai
|
60e07b95b2
|
Fix typo in Load filters docstring
|
2014-07-28 17:15:18 -07:00 |
|
C. R. Oldham
|
508a8c76f1
|
Merge pull request #14549 from scott-w/upstream
Update documentation on rabbitmq_user
|
2014-07-28 08:43:18 -06:00 |
|
Pedro Algarvio
|
c58ab503fc
|
Merge pull request #14548 from mickep76/pepa-make-color-output-optional
Make color output optional
|
2014-07-28 15:22:51 +01:00 |
|
Scott Walton
|
923bda842e
|
Merge branch 'develop' of https://github.com/saltstack/salt into upstream
|
2014-07-28 13:41:55 +01:00 |
|
Scott Walton
|
b3c857745b
|
Updated docstring #14484
|
2014-07-28 13:37:22 +01:00 |
|
Michael Persson
|
84c2488077
|
Fixed remaining pylint error
|
2014-07-28 14:09:15 +02:00 |
|
Michael Persson
|
64cb37323d
|
Attempt at fixin pylint errors
|
2014-07-28 14:00:10 +02:00 |
|
Michael Persson
|
9822e121e5
|
Make color output optional
|
2014-07-28 12:43:38 +02:00 |
|
Pedro Algarvio
|
f5afd434fe
|
Merge pull request #14545 from techhat/pepa
Pepa cleanups
|
2014-07-28 08:57:55 +01:00 |
|
Joseph Hall
|
576db03638
|
Remove try/except blocks for imports that will always exist
|
2014-07-28 01:25:12 -06:00 |
|
Erik Johnson
|
fec7703ef3
|
Merge branch '2014.7' of https://github.com/saltstack/salt into develop
|
2014-07-27 22:06:17 -05:00 |
|
Erik Johnson
|
1858114027
|
Merge pull request #14541 from garethgreenaway/14530_ipv6_only_broken
Fixing debian_ip.py per #14530.
|
2014-07-27 21:53:39 -05:00 |
|
Gareth J. Greenaway
|
417c0740bc
|
Fixing debian_ip.py per #14530.
|
2014-07-27 18:07:45 -07:00 |
|
Thomas S Hatch
|
4c52bc822a
|
Merge pull request #14538 from makinacorpus/fix
Fix pepa shortcircuiting all scripts args at it'simport time...
|
2014-07-27 09:11:18 -06:00 |
|
Mathieu Le Marec - Pasquet
|
9a2460d999
|
Fix pepa shortcircuiting all scripts args at it'simport time...
This kills salt-call & i think other salt scripts...
How can that hit develop !
|
2014-07-27 16:20:27 +02:00 |
|
Erik Johnson
|
1fdf8905a9
|
Merge branch '2014.7' into develop
|
2014-07-26 19:17:42 -05:00 |
|
Erik Johnson
|
d21af7c8b6
|
Merge pull request #14534 from garethgreenaway/2014.7_14426_apt_virtual_pkg
Switching the _get_virtual function to use pure python instead of a call to grep-available
|
2014-07-26 19:16:57 -05:00 |
|
Gareth J. Greenaway
|
d73c76e847
|
Switching the _get_virtual function to use pure python instead of a call to grep-available.
|
2014-07-26 17:13:08 -07:00 |
|
Erik Johnson
|
0576a6831f
|
Revert "Switching the _get_virtual function to use pure python instead of a call to grep-available."
This reverts commit ad90bc4908, I'm having
Gareth re-open against 2014.7 so I can forward merge.
|
2014-07-26 19:02:36 -05:00 |
|
Erik Johnson
|
bfb1f95887
|
Merge pull request #14531 from garethgreenaway/14426_apt_virtual_pkgs
Fixes to aptpk.py for virtual packages
|
2014-07-26 18:53:23 -05:00 |
|
Gareth J. Greenaway
|
ad90bc4908
|
Switching the _get_virtual function to use pure python instead of a call to grep-available. The issue with grep-available is that it doesn't know about virtual packages until they've been installed, if you're installing a virtual package via Salt which hasn't been installed before then the process will fail because the virtual package won't be in the list of available packages. Using the apt.cache module instead ensure that _get_virtual shows *all* virtual packages.
|
2014-07-26 10:24:04 -07:00 |
|
Thomas S Hatch
|
4a3c9a3a3f
|
Merge pull request #14528 from hulu/use-isinstance-pkg
pkg state: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:54:27 -06:00 |
|
Thomas S Hatch
|
9a2a389c4e
|
Merge pull request #14527 from hulu/use-isinstance-more-misc
other misc modules: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:53:56 -06:00 |
|
Thomas S Hatch
|
cf4a2f4453
|
Merge pull request #14526 from cvrebert/patch-4
modules.mysql: simplify: type([]) ==> list
|
2014-07-25 21:53:37 -06:00 |
|
Thomas S Hatch
|
c77bad86cd
|
Merge pull request #14525 from hulu/use-isinstance-file
file state: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:53:25 -06:00 |
|
Thomas S Hatch
|
a9875fc6f7
|
Merge pull request #14524 from whiteinge/doc-hashutil
Add docs for the hashutil module
|
2014-07-25 21:52:57 -06:00 |
|
Thomas S Hatch
|
b02a29c3c6
|
Merge pull request #14521 from hulu/modjk-ssh-use-isinstance
modjk & ssh modules: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:49:55 -06:00 |
|
Thomas S Hatch
|
9b20bba421
|
Merge pull request #14520 from hulu/cloud-use-isinstance
cloud.clouds.*: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:49:21 -06:00 |
|
Thomas S Hatch
|
053263ff1b
|
Merge pull request #14518 from hulu/lxc-use-isinstance
lxc module: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:48:18 -06:00 |
|
Thomas S Hatch
|
a73d1c52c8
|
Merge pull request #14517 from hulu/misc-use-isinstance
misc modules: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 21:47:40 -06:00 |
|
Thomas S Hatch
|
0aed242337
|
Merge pull request #14512 from cvrebert/patch-2
remove incorrect comma in states.process.absent()
|
2014-07-25 21:47:18 -06:00 |
|
Thomas S Hatch
|
5404be8660
|
Merge pull request #14511 from cvrebert/patch-1
fix indentation mistake in setup.py
|
2014-07-25 21:46:55 -06:00 |
|
Thomas S Hatch
|
f412f21ca4
|
Merge pull request #14510 from hulu/hire-a-copyeditor-already
spelling fixes in 2014.7.0 release notes
|
2014-07-25 21:46:31 -06:00 |
|
Thomas S Hatch
|
aeda9730ca
|
Merge pull request #14460 from steverweber/fix_restarts
fix issues with keepalive minion
|
2014-07-25 21:46:01 -06:00 |
|
Chris Rebert
|
63899bcc07
|
pkg state: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 19:26:08 -07:00 |
|
Chris Rebert
|
4ebb1285f6
|
other misc modules: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 19:17:41 -07:00 |
|
Joseph Hall
|
af60332cf0
|
Merge pull request #14522 from s0undt3ch/hotfix/cleanup-pepa
Module does not rename itself, no need to define `__virtualname__`, simply return `True`
|
2014-07-25 20:13:43 -06:00 |
|
Chris Rebert
|
eb07f8363a
|
modules.mysql: simplify: type([]) ==> list
|
2014-07-25 19:12:58 -07:00 |
|
Chris Rebert
|
15537c4cdc
|
file state: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 19:07:50 -07:00 |
|
Seth House
|
3164b2164e
|
Added hashutil module to docs index
|
2014-07-25 20:06:54 -06:00 |
|
Joseph Hall
|
c375eef6a4
|
Merge pull request #14519 from hulu/use-isinstance-mysql-pillar
MySQL pillar: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 20:01:55 -06:00 |
|
Joseph Hall
|
e6539a3f50
|
Merge pull request #14513 from cvrebert/patch-3
salt.wheel: rm redundant import of salt.exceptions
|
2014-07-25 20:01:19 -06:00 |
|
Chris Rebert
|
35e680c82f
|
cloud.clouds.*: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 19:00:18 -07:00 |
|
Seth House
|
60e4de3fdd
|
Removed hashutils functions without tests
|
2014-07-25 19:59:30 -06:00 |
|
Seth House
|
d7d8beabb8
|
Merge remote-tracking branch 'upstream/2014.7' into develop
|
2014-07-25 19:55:43 -06:00 |
|
Chris Rebert
|
f3830b1c44
|
modjk & ssh modules: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 18:53:01 -07:00 |
|
Pedro Algarvio
|
99e12afd76
|
Module does not rename itself, no need to define __virtualname__, simply return True.
|
2014-07-26 02:47:37 +01:00 |
|
Chris Rebert
|
da42134692
|
MySQL pillar: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 18:43:55 -07:00 |
|
Joseph Hall
|
eeb2843f1f
|
Merge pull request #14516 from hulu/use-isinstance-utils
utils modules: type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 19:42:54 -06:00 |
|
Chris Rebert
|
ef64f629a9
|
type(X) is Y ==> isinstance(X, Y)
|
2014-07-25 18:35:23 -07:00 |
|