mguegan
54c3496172
Merge remote-tracking branch 'upstream/develop' into module_zpool
2013-05-19 21:34:57 +02:00
Thomas S Hatch
9f43170d80
Merge pull request #5147 from s0undt3ch/develop
...
Missing import and some formatting love to `salt.{modules,states}.eselect`
2013-05-19 12:34:30 -07:00
mguegan
faa05712ff
pull #5144 : use built-in set instead of list
2013-05-19 21:33:18 +02:00
Pedro Algarvio
8a68dee408
Missing import and some formatting love to salt.{modules,states}.eselect.
...
* Add missing import.
* Use function alias in order not to shadow `set`
* Simplify some reading logic
* PEP-8 and formatting fixes.
2013-05-19 20:28:27 +01:00
Thomas S Hatch
5eb8933d49
Merge pull request #5146 from faust/gentoo-eselect
...
english fail, sorry
2013-05-19 12:19:03 -07:00
faust
2f2ac96f43
added "--ask n" to emerge
...
--ask n is the default for emerge, but the user can change this behaviour
using EMERGE_DEFAULT_OPTS in make.conf causing emerge to wait indefinitely.
I've also added "--with-bdeps=y" to update command.
2013-05-19 21:18:03 +02:00
faust
0032ba407c
english fail, sorry
2013-05-19 21:09:57 +02:00
David Boucha
8f083cf006
Merge pull request #5145 from UtahDave/fix_win_file
...
don't import get_user. Defined locally
2013-05-19 12:09:14 -07:00
David Boucha
a04702fb2b
don't import get_user. Defined locally
2013-05-19 13:07:26 -06:00
mguegan
57d183bda0
modules/zpool : make use of memoize
2013-05-19 19:16:06 +02:00
mguegan
d2600c2161
modules/zpool : add check for FreeBSD and complete doc
2013-05-19 17:48:33 +02:00
mguegan
2f21fcb9bb
modules/zpool : make it available for compatible Solaris family
...
The whole module has been reviewed for a better compliance with Salt and now
Solaris (> 5.9) / SmartOS can use it. Some commands have been simplified and
the idea is to provide another module for the 'zfs' command support.
2013-05-19 17:22:00 +02:00
Thomas S Hatch
859f454969
Merge pull request #5143 from faust/gentoo-eselect
...
Execution and state modules for Gentoo's "eselect"
2013-05-19 07:21:06 -07:00
faust
13b7ebb7f4
Execution and state modules for Gentoo's "eselect"
2013-05-19 15:41:47 +02:00
Emile 'iMil' Heitor
dc6f71da23
Comments typos and refinement
2013-05-19 14:04:02 +02:00
Emile 'iMil' Heitor
59442b03b8
Added a __virtual__ so unsupported OSes don't get lost
2013-05-19 13:33:45 +02:00
Emile 'iMil' Heitor
3ff7d97299
Added \n's after CLI Example like other modules
2013-05-19 12:50:53 +02:00
Emile 'iMil' Heitor
87960c1a99
Added the bridge module, for gathering and managing bridging informations on GNU/Linux and NetBSD
2013-05-19 12:43:49 +02:00
Thomas S Hatch
43c731a75a
Merge pull request #5141 from jasonrm/doc-file-recurse
...
Fix minor file.recurse doc error
2013-05-18 17:22:19 -07:00
Jason R. McNeil
1ce15ac0cf
Fix minor file.recurse doc error
...
This minor doc error got me stuck for a few more minutes than it should have, better fix it.
2013-05-18 17:19:00 -07:00
Thomas S Hatch
340b45d801
fix pydsl test
2013-05-18 22:58:08 +00:00
Thomas S Hatch
6b01c8380d
Add pydsl runtime test per #5055
2013-05-18 22:51:53 +00:00
Thomas S Hatch
7c7f7652fe
Fix #5055
2013-05-18 22:50:18 +00:00
Thomas S Hatch
123d52bdc6
Can't serialize pydev/stateconf, start on #5055
2013-05-18 22:47:14 +00:00
David Boucha
927e04e238
Merge pull request #5140 from iMilnb/develop
...
Added NetBSD support to _hw_data
2013-05-18 13:11:01 -07:00
Emile 'iMil' Heitor
aee54296b6
Added NetBSD support to _hw_data
2013-05-18 20:39:24 +02:00
Jason R. McNeil
b5c3ebccc4
Note that brew will silently ignore unrecognized options and pass any recognized option to every package.
2013-05-18 10:37:03 -07:00
Thomas S Hatch
119a59e838
meow?
2013-05-18 09:56:00 -06:00
Thomas S Hatch
9edf597b33
Merge pull request #5135 from hulu/socketutil-var-naming
...
improve var naming in socket_util.IPv4Address init
2013-05-18 08:47:02 -07:00
Thomas S Hatch
4ce50a05e6
Merge pull request #5134 from hulu/state-high-shadowing
...
state.py: high => high_, to avoid shadowing the func
2013-05-18 08:45:45 -07:00
Thomas S Hatch
eb47b3bab8
Merge pull request #5133 from hulu/state-top-shadowing
...
state.py: top -> top_, to avoid shadowing the func
2013-05-18 08:44:22 -07:00
Joseph Hall
8a9dcc5ae6
Merge pull request #5138 from bclermont/patch-3
...
fix git.remote_set usage
2013-05-18 07:18:32 -07:00
Joseph Hall
8289c0c166
Merge pull request #5139 from virtua-network/sunos_hwdata
...
grains/core : add hw_data support for SunOS kernel type
2013-05-18 07:17:43 -07:00
mguegan
7afc78c99a
grains/core : add hw_data support for SunOS kernel type
...
SmartOS / Solaris systems can now have access to useful hardware
information (from smbios command).
Note : it only works on systems which export SMBIOS table (x86
platforms, Global Zone in SmartOS...). It DOESN'T work on SPARC
platform and inside a SmartOS zone (ie. SmartMachine)
2013-05-18 12:05:09 +02:00
Bruno Clermont
5e26260eef
fix git.remote_set usage
...
fix kwargs keys name:
https://github.com/saltstack/salt/blob/develop/salt/modules/git.py#L638
2013-05-18 16:35:58 +08:00
David Boucha
0be234c411
Merge pull request #5137 from UtahDave/fix_windows_process
...
add try/except when getting process owner
2013-05-17 23:48:32 -07:00
David Boucha
871c9e6a35
Fix pkg.remove
2013-05-18 00:46:39 -06:00
David Boucha
4e71d74ff1
add try/except when getting process owner
2013-05-17 22:23:27 -06:00
Chris Rebert
7c13f7ed20
improve var naming in socket_util.IPv4Address init
2013-05-17 21:19:13 -07:00
Chris Rebert
322836c848
state.py: high -> high_, to avoid shadowing the func
2013-05-17 21:13:50 -07:00
Chris Rebert
12c21ffe2c
state.py: top -> top_, to avoid shadowing the func
2013-05-17 21:07:33 -07:00
Jason R. McNeil
9cc387c0e7
Fix doc formatting in brew.
2013-05-17 20:52:15 -07:00
Thomas S Hatch
24d58fed95
Merge pull request #5128 from hulu/running-shadowing
...
rename running => runnings to avoid shadowing; use comprehension
2013-05-17 20:41:25 -07:00
Thomas S Hatch
f2b62412dc
Merge pull request #5127 from hulu/file-comment-shadowing
...
file state: comment => comment_, to avoid shadowing outer func
2013-05-17 20:40:27 -07:00
Thomas S Hatch
23ef18923d
Merge pull request #5126 from hulu/stat-shadowing
...
safe_walk: stat -> status, to avoid shadowing the imported 'stat' module
2013-05-17 20:38:40 -07:00
Thomas S Hatch
7aaae9c40d
Merge pull request #5125 from hulu/avoid-double-sort
...
State.order_chunks(): sort only once instead of twice
2013-05-17 20:37:04 -07:00
Jason R. McNeil
9f0e418b17
Add options parameter to brew module.
...
Adds additional support for the many brew packages that can be installed with options. Brew itself however does not handle the reinstall process if you want to change the options after install. Brew currently forces you to do an uninstall followed by a install.
I imagine that we could automate the updating of options as the `brew info <pkg name>` command does contain info about what the last install options were. However parsing that and comparing to the state options is a bit much for me to take on right now.
2013-05-17 20:32:24 -07:00
Thomas S Hatch
aac8cb0f63
Merge pull request #5122 from cvrebert/patch-2
...
rm unused salt.utils import from openbsdpkg module
2013-05-17 20:31:51 -07:00
Chris Rebert
cc9f58f40d
rename running -> runnings to avoid shadowing; use comprehension
2013-05-17 18:31:45 -07:00
Chris Rebert
c33d112550
file state: comment -> comment_, to avoid shadowing outer func
2013-05-17 18:09:21 -07:00
