Baiju Muthukadan
4668e2c5d8
ignore 'tmp' directory created by integration test
2012-07-01 03:46:43 +05:30
Thomas S Hatch
0c66239842
Merge pull request #1513 from wilkystyle/develop
...
Develop
2012-06-29 09:53:33 -07:00
Mike Wilkerson
6805eae79a
fixed globbing when no minions are found
2012-06-29 12:47:33 -04:00
Mike Wilkerson
a8d3ac3de1
Merge remote-tracking branch 'upstream/master' into develop
2012-06-29 12:15:13 -04:00
Thomas S Hatch
f922152bfc
Spelling error in state module
2012-06-28 22:10:53 -06:00
Thomas S Hatch
df0dfc4638
Merge pull request #1511 from peacetara/patch-2
...
The function appears to be called run now, and not sls.
2012-06-28 14:18:09 -07:00
Thomas S Hatch
1ba7629bc0
Merge pull request #1510 from peacetara/patch-1
...
Adding 'Running and debugging salt states' section. That shows off the ...
2012-06-28 11:54:42 -07:00
peacetara
3aaad890ca
The function appears to be called run now, and not sls.
2012-06-28 11:53:54 -07:00
peacetara
2f54587cbc
Adding 'Running and debugging salt states' section. That shows off the salt-call command, to help you debug. Also shows you how in the world to run a .sls file, which is always a good thing :)
2012-06-28 11:51:25 -07:00
Thomas S Hatch
8e51797e0f
Add makedirs support to file.rename
...
Fix #1447
2012-06-27 17:58:37 -06:00
Thomas S Hatch
b9b0a36b07
Add file.rename
2012-06-27 16:42:19 -06:00
Thomas S Hatch
1d6b929d5b
Jeff wanted more comments :P
2012-06-27 16:02:05 -06:00
Thomas S Hatch
e15957e975
Fix rare issue when watch is used but not supported
2012-06-27 15:27:00 -06:00
Thomas S Hatch
f9c3facbed
it would only check one before
2012-06-27 13:47:58 -06:00
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
