Joseph Hall
ec4e6945ea
Basic framework for modifying dnsmasq config files
2013-02-15 15:34:49 -07:00
Corey Quinn
e6a6d68824
Fixed whitespace issue
2013-02-15 11:59:13 -07:00
Corey Quinn
25fd4112af
Updated test to properly determine homebrew user
2013-02-15 11:59:13 -07:00
Thomas S Hatch
faba925e2e
Merge pull request #3740 from basepi/fix_cmdmod_daemon_bug
...
Fix cmdmod.py daemon error introduced by 77087955
2013-02-15 10:49:39 -08:00
Colton Myers
6f3db22476
Fix cmdmod.py daemon error introduced by 77087955
2013-02-15 11:46:01 -07:00
Thomas S Hatch
3ad68d42ac
Fix #3716
2013-02-15 10:54:47 -07:00
Thomas S Hatch
7708795521
Fix #3717
2013-02-15 10:42:06 -07:00
Thomas S Hatch
9c573fe881
Merge pull request #3735 from UtahDave/add_msiiexec_check
...
Add msiexec flag for Windows Installer Packages. Fixes #3667
2013-02-15 08:10:55 -08:00
David Boucha
656432b6b8
Clarify msiexec docs a little
2013-02-14 19:39:12 -07:00
David Boucha
d1ed6b0f58
Add docs for msiexec
2013-02-14 19:36:24 -07:00
David Boucha
27059ed61c
version # is next level down the dict
2013-02-14 19:29:01 -07:00
David Boucha
aa44244c26
Use correct dictionary key
2013-02-14 19:21:28 -07:00
Thomas S Hatch
d7cfcf8407
Add arp translation to network execution module
2013-02-14 21:16:52 -05:00
David Boucha
db40c6a241
check for msiexec in correct location
2013-02-14 19:02:42 -07:00
David Boucha
b038b66865
check for msiexec in correct location
2013-02-14 19:01:59 -07:00
David Boucha
485b527262
Create win repo directory structure if not there
2013-02-14 18:37:17 -07:00
David Boucha
ad0cd13752
Add msiexec to remove
2013-02-14 17:29:08 -07:00
David Boucha
7935df0b77
Add msiexec option to the install
2013-02-14 17:26:50 -07:00
Thomas S Hatch
1d31da637a
Add basic disk type detection
2013-02-14 18:00:19 -05:00
Thomas S Hatch
be6e579ef5
Basic networking setup in place
2013-02-14 17:40:29 -05:00
Thomas S Hatch
01081d9f19
Merge pull request #3730 from giantlock/develop
...
fix bug: Client.cache_dir()
2013-02-14 13:26:08 -08:00
Denis Generalov
56f3450ad2
fix bug: Client.cache_dir()
2013-02-15 01:16:00 +04:00
Thomas S Hatch
763b829d25
Add extra error check to detect_hyper
2013-02-14 15:29:28 -05:00
Thomas S Hatch
8a30793419
Merge pull request #3724 from herself/hf-test
...
Fix user info not displayed correctly when group doesn't map cleanly
2013-02-14 09:16:08 -08:00
Wiesław Herr
e54cf80448
Fix user info not displayed correctly when group doesn't map cleanly
2013-02-14 09:15:52 +01:00
Thomas S Hatch
ae4ac5db02
Merge pull request #3723 from archtaku/docs
...
Add notes on requisite matching
2013-02-13 22:10:12 -08:00
Thomas S Hatch
a5cbe46c79
add pause and resume
2013-02-14 01:12:04 -05:00
Erik Johnson
5eef8217d6
Add notes on requisite matching
2013-02-13 21:34:21 -06:00
Thomas S Hatch
53b9a10ac2
Add reset function to virt runner
2013-02-13 19:14:18 -05:00
Thomas S Hatch
739c0bb59c
Add state_terse config option and terse kwarg to state.highstate
...
and state.sls
now in the master config you can set state_data: terse to trim out
all of the "greens" or pass terse=True to state.highstate or state.sls
2013-02-13 16:28:46 -07:00
Thomas S Hatch
869dd9e102
Add start and force_off runner functions
2013-02-13 18:24:56 -05:00
Thomas S Hatch
f29303eeb7
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-02-13 18:24:52 -05:00
Thomas S Hatch
05a742ec28
Merge pull request #3715 from rca/test_file_sed_limit
...
Added test for limit in file.sed.
2013-02-13 15:18:30 -08:00
Roberto Aguilar
c0c67a7509
Added test for limit in file.sed.
2013-02-13 14:36:34 -08:00
Thomas S Hatch
3b616bc515
fix bad ref to vm name
2013-02-13 14:01:10 -05:00
David Boucha
e51e6df47d
Add link to writing State docs
2013-02-13 11:34:06 -07:00
Thomas S Hatch
cf2c1aee15
Add state check to virt_query
2013-02-13 13:34:02 -05:00
Thomas S Hatch
c23bb2b72e
Merge pull request #3709 from herlo/develop
...
update the start / kill order with chkconfig
2013-02-13 10:21:21 -08:00
Clint Savage
fe22763da0
update the start / kill order with chkconfig
2013-02-13 11:17:33 -07:00
Thomas S Hatch
5014b7640c
Merge pull request #3700 from giantlock/develop
...
Postgres module corrections
2013-02-13 09:22:49 -08:00
Thomas S Hatch
c9a3cfbadb
Merge pull request #3707 from sbworth/develop
...
Add optional key argument to display subtree of pillar data
2013-02-13 09:17:34 -08:00
Thomas S Hatch
26dc7457a3
Merge pull request #3704 from holmboe/alternative-salt-executables
...
Allow alternative executables
2013-02-13 09:16:48 -08:00
Thomas S Hatch
c6ffcd513a
Merge pull request #3698 from sshturm/setuptools_fix
...
Import install command from setuptools if we use them.
2013-02-13 09:11:57 -08:00
Thomas S Hatch
d4028b6a1c
Merge pull request #3697 from rca/escape_limit_in_file_dot_sed
...
Updated limit to be escaped like before and after.
2013-02-13 09:09:41 -08:00
Steven Butterworth
80b008f7d0
Add optional key argument to display subtree of pillar data
...
The output of pillar.data comprises a substantial chunk of data.
By introducing key selection on the dictionary, we can display
the subtree of immediate interest.
Inadequacy: Should allow for arbitrary keying into subsections
of the data. Current change is the simplest useful improvement.
2013-02-13 11:38:50 -05:00
Henrik Holmboe
4fa8e63033
Fix the LSB header
...
I got complaints from insserv that the LSB header was not compliant. It was
missing required keywords, which must be there even if they are empty.
2013-02-13 16:32:49 +01:00
Henrik Holmboe
464ca9dd1f
Allow alternative executables
...
With this commit it is possible to use virtualenv with the init scripts.
For example, I have this in my /etc/default/salt:
```
SALTMASTER=/srv/venvs/venv-1/bin/salt-master
SALTMINION=/srv/venvs/venv-1/bin/salt-minion
SALTSYNDIC=/srv/venvs/venv-1/bin/salt-syndic
SALTAPI=/srv/venvs/venv-1/bin/salt-api
PYTHON=/srv/venvs/venv-1/bin/python
```
2013-02-13 15:30:13 +01:00
Denis Generalov
aa8b50b92e
Merge branch 'pgsql' into develop
...
Conflicts:
salt/modules/postgres.py
2013-02-13 14:54:30 +04:00
Svetlana Shturm
6dac3120a8
Import install command from setuptools if we use them.
...
This commit fixes bug with option --single-version-externally-managed.
2013-02-13 14:53:39 +04:00
Roberto Aguilar
310ba3d555
Updated limit to be escaped like before and after.
2013-02-13 00:58:18 -08:00
