Thomas S Hatch
1f1354440b
Add a cmd.script state
...
So that scripts can be executed dierctly from the master, Fix #1486
2012-06-27 12:37:59 -06:00
Thomas S Hatch
44a40b7072
fix docstring spelling error
2012-06-27 12:13:33 -06:00
Thomas S Hatch
0d8876f68b
Fix #1454
2012-06-27 10:57:27 -06:00
Thomas S Hatch
eb0f5873e0
Fix #1460
2012-06-27 10:32:48 -06:00
Thomas S Hatch
febd81d65d
Hook verify_socket function into the master startup
...
Fix #1452
2012-06-27 10:27:32 -06:00
Thomas S Hatch
551a788ea9
Add verify_socket method
2012-06-27 10:26:58 -06:00
Thomas S Hatch
1b13c2c155
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-06-27 09:10:50 -06:00
Thomas S Hatch
33646d77a8
Fix #1505
2012-06-27 09:09:58 -06:00
Jeff Schroeder
e96f08dbbc
Merge pull request #1502 from avimar/develop
...
Update GIT status help text
2012-06-26 15:38:25 -07:00
avimar
47abbfea16
Update develop
2012-06-27 01:16:53 +03:00
avimar
ee7cd4c690
Update develop
2012-06-27 01:16:42 +03:00
avimar
01eb6e588c
Update develop
2012-06-27 01:16:26 +03:00
Jeff Schroeder
bee175fdd3
Merge pull request #1503 from andytinycat/develop
...
Fix documentation oops in 'include' option
2012-06-26 15:06:45 -07:00
Andy Sykes
29c2763527
Fix documentation oops in 'include' option
2012-06-26 21:55:21 +01:00
avimar
c3179cc720
add note + how to do hashed pass
2012-06-26 23:36:26 +03:00
avimar
96ff108fd6
dependency
2012-06-26 23:33:19 +03:00
avimar
dc86e8ed1d
grammar typo
2012-06-26 23:29:55 +03:00
avimar
f1c86d9557
Add note about config
2012-06-26 23:28:44 +03:00
avimar
c8ffff1e0c
Be slightly more descriptive in the mysql docs
2012-06-26 23:26:47 +03:00
avimar
95cbabeb77
Update develop
2012-06-26 23:21:23 +03:00
Jeff Schroeder
162762ec6f
Merge pull request #1501 from andytinycat/develop
...
Bugfix + documentation update for 'include' option
2012-06-26 13:00:46 -07:00
Andy Sykes
df096d754f
Documentation oops
2012-06-26 20:54:56 +01:00
Andy Sykes
fbbe74bb35
Bugfixes/documentation update for the 'include' option
...
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path
Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
2012-06-26 20:53:27 +01:00
Thomas S Hatch
3e6da4ff04
Merge pull request #1497 from jhutchins/networkstate
...
Networkstate
2012-06-25 15:09:39 -07:00
Jeff Hutchins
6ee599ebd5
Fix minor logic error.
2012-06-25 14:43:47 -06:00
Thomas S Hatch
03a8cc5532
Catch error where value of 0 is truncated
2012-06-25 10:56:08 -06:00
Thomas S Hatch
129a5d8ca8
docstring cleanup
2012-06-25 10:32:36 -06:00
Thomas S Hatch
a7bed6999e
just return the retcode on script_retcode
2012-06-25 10:13:09 -06:00
Thomas S Hatch
fdd03dd25c
Add a cmd.script function to allow clean download/execution of a script
2012-06-25 09:54:06 -06:00
Thomas S Hatch
97a19ee16a
fix #1453
2012-06-25 09:26:58 -06:00
Thomas S Hatch
ebc01006ba
pep8 some docstring formatting
2012-06-25 09:04:45 -06:00
Jeff Schroeder
e43cdba19d
Merge pull request #1494 from avimar/patch-2
...
Add examples for state.hosts
2012-06-25 08:01:49 -07:00
avimar
8f49fab86b
Add example and warning for multiple name for host. Also specify path. And re: changing entries.
2012-06-25 17:59:18 +03:00
Bret Palsson
d26d47d9e7
Added require_reboot option to apply settings
...
This is useful when it's not ideal to restart networking while the machine is running.
Examples: Restarting the network on a system running:
- OCFS2: will interrupt the heartbeat for OCFS2 causing errors and a stalled system.
- OpenVPN: will break the tunnel and/or bridging.
In both of the above cases a reboot is recommended.
2012-06-25 08:36:38 -06:00
Thomas S Hatch
e533c8770b
Add list_mods function to kmod module, fix #1493
2012-06-25 08:28:57 -06:00
Bret Palsson
94c66d1923
Cleanup line
2012-06-25 01:30:41 -06:00
Bret Palsson
510b405413
RH Specific Global Network Settings -
...
/etc/sysconfig/network
2012-06-25 01:26:24 -06:00
Bret Palsson
c9ed6b6f68
Support global network settings
...
Redhat global network settings template
2012-06-24 23:07:18 -06:00
Bret Palsson
8b9e98982f
Merge remote-tracking branch 'salt-develop/develop' into develop
2012-06-24 20:15:14 -06:00
Seth House
f537097717
Merge pull request #1492 from UtahDave/develop
...
Skip or fix unit tests on Windows
2012-06-24 19:09:43 -07:00
David Boucha
7e7d831103
Disable find unit tests on Windows
...
There are problems with pwd, grp and /dev/null
as they don't exist on Windows. So we are disabling
tests that use those for now.
2012-06-24 19:43:43 -06:00
David Boucha
bb72a4dfba
Fix jinja_test on Windows
2012-06-24 18:16:22 -06:00
Jeff Schroeder
c39eb0020f
Merge pull request #1491 from UtahDave/develop
...
Fix startup import errors on Windows OS
2012-06-24 16:46:12 -07:00
David Boucha
1efcbf0679
Fix startup import errors on Windows OS
...
Added try statements around grp and pwd imports
that were choking on Windows.
2012-06-24 17:42:48 -06:00
Thomas S Hatch
2ac5f993ef
Merge pull request #1489 from baijum/pwd_grp_imports
...
The pwd & grp modules are only available for unix
2012-06-23 10:37:38 -07:00
Baiju Muthukadan
f9e9e32eaf
The pwd & grp modules are only available for unix
2012-06-23 11:47:53 +02:00
Thomas S Hatch
cf0f96567a
Add a comma to some docs
2012-06-22 08:26:38 -06:00
Thomas S Hatch
858b021e62
Merge pull request #1483 from jhutchins/mount_fix
...
Fix error.
2012-06-20 12:24:01 -07:00
Jeff Hutchins
6f861bcf96
Fix error.
2012-06-20 12:54:02 -06:00
Thomas S Hatch
ff7317f946
Add docs for new caller api
2012-06-19 23:51:58 -06:00
