valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,558 Commits 24 Branches 182 Tags 341 MiB
4b02d26f4d
Commit Graph

13558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
4b02d26f4d Merge pull request #5229 from hulu/use-raw-strings-for-regexes-dammit 
fix new pylint W1401 (Anomalous backslash in string) instances
 2013-05-24 01:51:38 -07:00
Thomas S Hatch
97a75645b8 Merge pull request #5201 from rballestrini-cars/develop 
Resolve bug where states/cmd.py _run_check() function was mutating cmd_k...
 2013-05-24 01:38:49 -07:00
Thomas S Hatch
c3976664d8 Merge pull request #5198 from faust/makeconf-features 
added functions for FEATURES variable
 2013-05-24 01:34:06 -07:00
Thomas S Hatch
20732ae021 Merge pull request #5197 from faust/eix-ask-no 
added "--ask n" to eix-sync (see #5148)
 2013-05-23 23:28:41 -07:00
Thomas S Hatch
a22b605f1c Merge pull request #5187 from geoffgarside/freebsd-mount 
Fix salt.modules.mount for FreeBSD
 2013-05-23 21:35:30 -07:00
David Boucha
bc7088747a Merge pull request #5240 from basepi/jinjaerrors4966 
Add line number to Jinja errors, Fix #4966
 2013-05-23 15:40:13 -07:00
Colton Myers
695dc745d4 Clean up the error message 2013-05-23 16:33:21 -06:00
Colton Myers
3567506c2d Add line number to Jinja errors, Fix #4966 
Thanks to @Mrten to figuring this one out.  =)
 2013-05-23 16:24:59 -06:00
David Boucha
225b2d8c0f Merge pull request #5239 from UtahDave/develop 
Don't use a bare exception
 2013-05-23 15:14:38 -07:00
David Boucha
b3dda6e107 Don't use a bare exception 2013-05-23 16:14:00 -06:00
David Boucha
49f709e22b Merge pull request #5233 from cvrebert/patch-6 
bridge module: avoid bare `except:`
 2013-05-23 15:07:56 -07:00
David Boucha
20c5832f65 Merge pull request #5230 from hulu/xapi 
Various pylint fixes to the xapi module
 2013-05-23 15:06:28 -07:00
David Boucha
94cafc557c Merge pull request #5232 from cvrebert/patch-5 
zfs module: rm unused import of the `os` std lib module
 2013-05-23 15:05:40 -07:00
Joseph Hall
faeecd2138 Merge pull request #5238 from virtua-network/zpool_module 
Zpool module
 2013-05-23 14:53:13 -07:00
mguegan
eb41d6ddd0 modules/zpool : add scrub function 
Begin a scrub on selected zpool
 2013-05-23 23:44:22 +02:00
Chris Rebert
b6a45a7a2d bridge module: avoid bare except: 
************* Module salt.modules.bridge
W0702:287,12:find_interfaces: No exception type(s) specified
 2013-05-23 14:10:54 -06:00
Chris Rebert
13fce3b539 zfs module: rm unused import of the os std lib module 2013-05-23 14:09:20 -06:00
Chris Rebert
fe216a4f77 Various pylint fixes to the xapi module 
************* Module salt.modules.xapi
E0602: 58,14:_get_xapi_session: Undefined variable 'CommandExecutionError'
W0702: [many instances]: No exception type(s) specified
 2013-05-23 13:02:18 -07:00
Chris Rebert
84dd90054a fix new pylint W1401 (Anomalous backslash in string) instances 2013-05-23 12:40:59 -07:00
David Boucha
4ebbc336c5 Merge pull request #5228 from cvrebert/patch-4 
bridge mod: add spaces after commas
 2013-05-23 12:36:52 -07:00
Chris Rebert
f36661cc2a bridge mod: add spaces after commas 
************* Module salt.modules.bridge
C0324:211,4:_os_dispatch: Comma not followed by a space
 2013-05-23 13:31:54 -06:00
David Boucha
ccfd8da690 Merge pull request #5227 from cvrebert/patch-3 
xapi mod: add comma after space
 2013-05-23 12:31:10 -07:00
Chris Rebert
e7c08f9154 xapi mod: add comma after space 
************* Module salt.modules.xapi
C0324:722,16:vm_netstats._info: Comma not followed by a space
                ret[vif_rec['device']] = _get_metrics_record(xapi,'VIF',
                                                                 ^^
                                                            vif_rec)
 2013-05-23 13:30:08 -06:00
David Boucha
38a00bc72a Merge pull request #5226 from cvrebert/patch-2 
cmd state: add space after comma
 2013-05-23 12:29:54 -07:00
David Boucha
654fe9e591 Merge pull request #5225 from cvrebert/patch-1 
client.py: fix punctuation typo
 2013-05-23 12:29:20 -07:00
Chris Rebert
ed37f13709 cmd state: add space after comma 
************* Module salt.states.cmd
C0324:616,8:script: Comma not followed by a space
        cmd_kwargs.update({'args': name.split(' ',1)[1]})
                                                 ^^
 2013-05-23 13:25:32 -06:00
mguegan
ed4b06eba5 modules/zpool : add iostat function 
Displays I/O statistics for the given pools
 2013-05-23 21:25:25 +02:00
Chris Rebert
822e780d0b client.py: fix punctuation typo 2013-05-23 13:20:26 -06:00
Colton Myers
c3c767a6ac Merge pull request #5223 from UtahDave/fix_broadcast 
Don't fail if the broadcast field is empty
 2013-05-23 11:41:10 -07:00
David Boucha
85f6863cef Merge pull request #5222 from basepi/stateoptimization 
Remove redundant fnmatch call
 2013-05-23 11:39:38 -07:00
David Boucha
8b0a92cbbd Set default broadcast to empty string 2013-05-23 12:33:15 -06:00
David Boucha
ce741c0bb8 Add docstring 2013-05-23 12:32:13 -06:00
Colton Myers
51488519e5 Remove redundant fnmatch call 2013-05-23 11:18:10 -06:00
Joseph Hall
d8e85f0935 Merge pull request #5216 from faust/file-state-doc 
A little fix in "file state" documentation
 2013-05-23 05:12:39 -07:00
faust
5a2f7a35b2 A little fix in "file state" documentation 2013-05-23 12:14:48 +02:00
Thomas S Hatch
7ce7372999 Merge pull request #5214 from faust/iptables-gentoo 
Added correct path for Gentoo iptables config file.
 2013-05-23 01:52:19 -07:00
faust
90af42d759 Added correct path for Gentoo iptables config file. 
Gentoo also have a service to enforce iptables rules, maybe you can consider to handle it in some way.
I would have done that by myself, but this module looks to be still under heavy development and I don't want to create new issues.
 2013-05-23 09:40:16 +02:00
Thomas S Hatch
85a8deb3ad Merge pull request #5204 from basepi/missingsls5048 
Output an error if no matching sls file is found, Fix #5048
 2013-05-22 22:26:32 -07:00
Thomas S Hatch
67b1d33ea1 Merge pull request #5206 from l2ol33rt/develop 
Adding argument passing to cmd.script state
 2013-05-22 22:18:04 -07:00
Pedro Algarvio
5e0bdb2c09 Merge pull request #5208 from s0undt3ch/hotfix/yumpkg-fix 
Replace `rpmUtils.arch.getBaseArch()` with `rpmUtils.arch.getCanonArch()`
 2013-05-22 22:06:44 -07:00
Thomas S Hatch
0e71e34763 Merge pull request #5207 from shadowfax-chc/mdadm-shadowing-fix 
Fixed shadowing built-in in mdadm module. Ref #5085
 2013-05-22 21:51:53 -07:00
Thomas S Hatch
921cc3b47f Merge pull request #5205 from shadowfax-chc/npm-fix 
Fixed issue with npm.install for npm>=1.2.21.
 2013-05-22 21:39:17 -07:00
Pedro Algarvio
1e3ffbbd49 Replace rpmUtils.arch.getBaseArch() with rpmUtils.arch.getCanonArch(). 
According to the `rpmUtils.arch` source code, when no argument is passed to `rpmUtils.arch.getBaseArch()`, the result should be the same as `rpmUtils.arch.getCanonArch()`. However, in CentOS 6.4 with yum-3.2.29-40.el6.centos.noarch:

```python
>>> import rpmUtils.arch
>>> rpmUtils.arch.getBaseArch()
'i386'
>>> rpmUtils.arch.getBaseArch(None)
'i386'
>>> rpmUtils.arch.getCanonArch()
'i686'
>>>
```

This little thing made the `pkg.latest` state fail, and also the `pkg.latest_version` module function.
 2013-05-23 03:35:57 +01:00
shadowfax-chc
a48ae43976 Fixed shadowing built-in in mdadm module. Ref #5085 2013-05-22 21:42:22 -04:00
Robert Hernandez
96e7bbbacb Merge remote branch 'upstream/develop' into cmd_script 2013-05-22 17:42:10 -07:00
Robert Hernandez
cf0fabf654 Added argument passing to cmd.script state 2013-05-22 17:41:29 -07:00
shadowfax-chc
9f974d6407 Fixed issue with npm.install for npm>=1.2.21. Closes #5189 2013-05-22 20:27:29 -04:00
Colton Myers
f82654651a Make the error message more readable 2013-05-22 16:42:31 -06:00
Colton Myers
6a1db06edc Fix some pep8 2013-05-22 16:40:49 -06:00
Colton Myers
aa2a474acc Output an error if no matching sls file is found, Fix #5048 2013-05-22 16:39:45 -06:00