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
13fce3b539
zfs module: rm unused import of the os std lib module
2013-05-23 14:09:20 -06: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
Joseph Hall
a53109b31c
Merge pull request #5203 from virtua-network/zfs_module
...
modules/zfs : add module for zfs command
2013-05-22 14:14:10 -07:00
mguegan
e776b3d531
modules/zfs : add module for zfs command
...
This first version is very basic and partially handles the 'list'
argument.
2013-05-22 22:03:26 +02:00
Joseph Hall
5503862068
Merge pull request #5196 from basepi/virtrunner5120
...
Improve python3 compatibility with next() built-in
2013-05-22 10:29:33 -07:00
Colton Myers
101811a734
Improve python3 compatibility with next() built-in
2013-05-22 11:15:54 -06:00
Thomas S Hatch
1e50ec0537
Don't import direct function in modules so they are not exposed
2013-05-22 05:34:30 -06:00
Thomas S Hatch
3552bd968f
Merge pull request #5188 from geoffgarside/freebsd-xen
...
Add Xen DomU detection for FreeBSD.
2013-05-22 01:12:26 -07:00
Thomas S Hatch
d9e27a165b
Merge pull request #5184 from s0undt3ch/develop
...
Work around `__file__` `NameError` thrown by `bbfreeze`. Fixes #5172 .
2013-05-21 22:24:03 -07:00
Thomas S Hatch
46980febac
Merge pull request #5183 from sibsibsib/develop
...
fixed: TypeError in pkg._find_install_targets when version is None
2013-05-21 22:22:41 -07:00
Thomas S Hatch
fc105cbe55
Merge pull request #5182 from basepi/virtrunner5120
...
Use .next() instead of dummy loop, Fix #5120
2013-05-21 22:21:44 -07:00
Thomas S Hatch
c95d73ccd7
Merge pull request #5169 from iMilnb/develop
...
Implemented XenAPI backend as a 'virt' __virtual__ module
2013-05-21 22:19:31 -07:00
David Boucha
234c2bd932
Merge pull request #5185 from UtahDave/develop
...
Get proper Windows full pkg name
2013-05-21 18:48:14 -07:00
David Boucha
532f9afcc6
Get proper Windows full pkg name
2013-05-21 19:47:12 -06:00
Pedro Algarvio
6996afaf46
Work around __file__ NameError thrown by bbfreeze. Fixes #5172 .
2013-05-22 02:00:44 +01:00
sib
3f5b369b65
fixed: TypeError in pkg._find_install_targets when version is None
2013-05-21 21:44:13 -03:00
Colton Myers
757ab836ff
Fix my stupidity (leftover :)
2013-05-21 18:14:19 -06:00
