Thomas S Hatch
123d52bdc6
Can't serialize pydev/stateconf, start on #5055
2013-05-18 22:47:14 +00: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
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
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
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
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
Chris Rebert
bead76bd74
safe_walk: stat -> status, to avoid shadowing the imported 'stat' module
2013-05-17 18:01:02 -07:00
Chris Rebert
e46dcdf9d2
State.order_chunks(): sort only once instead of twice
2013-05-17 17:55:30 -07:00
Chris Rebert
a6818c7f3d
rm unused salt.utils import from openbsdpkg module
2013-05-17 18:22:23 -06:00
Pedro Algarvio
b9194a89bc
Merge pull request #5107 from cvrebert/patch-4
...
fix spelling
2013-05-17 16:09:37 -07:00
Pedro Algarvio
74a4fc3d77
Merge pull request #5111 from hulu/config-shadowing
...
include_config -> configuration, to avoid shadowing same-named func
2013-05-17 16:08:57 -07:00
Chris Rebert
49be514b5b
include_config -> configuration, to avoid shadowing same-named func
2013-05-17 15:23:39 -07:00
Pedro Algarvio
89c396f31c
Merge pull request #5106 from cvrebert/patch-3
...
have pylint ignore __env__ too
2013-05-17 15:17:50 -07:00
Chris Rebert
febbc85c84
fix spelling
2013-05-17 15:56:11 -06:00
Chris Rebert
18bdf193d3
have pylint ignore __env__ too
2013-05-17 15:50:02 -06:00
Thomas S Hatch
0e29824030
Merge pull request #5104 from cvrebert/patch-2
...
runners.manage: rm unused import of shutil
2013-05-17 14:12:38 -07:00
Thomas S Hatch
5529602428
Merge pull request #5103 from cvrebert/patch-1
...
pkgin mod: rm unused import of the os module
2013-05-17 14:12:26 -07:00
Thomas S Hatch
adb44411f1
Merge pull request #5099 from virtua-network/smartos_features
...
grains/core : add useful information from SmartOS zone
2013-05-17 14:11:34 -07:00
Thomas S Hatch
5796e870e8
Merge pull request #5097 from hulu/debian-packaging-shebang
...
/usr/bin/env python -> /usr/bin/python in scripts
2013-05-17 14:10:31 -07:00
Thomas S Hatch
0f558dc1fd
Merge pull request #5095 from binarydud/fix-activate-venv-for-pip
...
fixes #5093
2013-05-17 14:09:38 -07:00
Thomas S Hatch
a7e785fe7a
Merge pull request #5090 from timl/develop
...
yumpkg5: Comment indicates this is used on python >= 2.6 instead of < 2....
2013-05-17 14:08:58 -07:00
Thomas S Hatch
487fb648cb
Single quotes
2013-05-17 15:04:06 -06:00
Thomas S Hatch
3dc8034157
Merge pull request #5088 from virtua-network/grains_hostname
...
grains/core : fix fqdn / domain return on SunOS systems
2013-05-17 14:07:48 -07:00
Thomas S Hatch
6d93dce458
Fix #5105
2013-05-17 15:02:31 -06:00
Thomas S Hatch
583590f5ca
Add docstring per #5105
2013-05-17 15:01:38 -06:00
Thomas S Hatch
59be3e316f
Add docstring per #5105
2013-05-17 15:00:49 -06:00
Chris Rebert
73d5c8acae
runners.manage: rm unused import of shutil
2013-05-17 14:10:17 -06:00
Chris Rebert
1d90fd9c0e
pkgin mod: rm unused import of the os module
2013-05-17 13:07:57 -07:00
Colton Myers
88f88b70f3
Merge pull request #5081 from hulu/file-comment-shadowing
...
file state: refactor to avoid shadowing comment() func; optimization too
2013-05-17 12:56:01 -07:00
Chris Rebert
0f5965ef84
actually stop shadowing
2013-05-17 12:54:52 -07:00
