Colton Myers
fc16bd16c0
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/faq.rst
doc/ref/states/compiler_ordering.rst
doc/topics/best_practices.rst
doc/topics/development/conventions/formulas.rst
salt/config.py
salt/modules/state.py
salt/states/mount.py
salt/utils/event.py
tests/unit/utils/process_test.py
2014-12-16 14:45:25 -07:00
Seth House
51fa87c446
Change all state examples to use short-dec format for consistency
...
Closes #12419 .
The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.
find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
| xargs -0 -P10 -n1 awk '
BEGIN { RS=""; FS="\n" }
{ linenr = linect; linect += (NF + 1) }
/^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
print FILENAME "|" linenr + 2 "|", $1
}
' > ./salt-states.quickfix
2014-12-12 23:36:40 -07:00
Thomas Jackson
f0aae727ce
Comma cleanup
2014-12-12 11:39:07 -08:00
Thomas Jackson
85864eca4a
Comma cleanup
2014-12-12 11:37:59 -08:00
Thomas Jackson
7da2bbc457
fix usage of e.g (no comma)
2014-12-12 11:37:48 -08:00
Thomas Jackson
8df54973c3
Comma cleanup
2014-12-12 11:34:51 -08:00
Thomas Jackson
da3ea213e9
Comma cleanup
2014-12-12 11:34:34 -08:00
Thomas Jackson
23674c100d
Comma cleanup
2014-12-12 11:33:14 -08:00
Thomas S Hatch
e094b0136f
Merge pull request #18902 from jacksontj/develop
...
More grammar/style cleanup
2014-12-12 09:40:55 -07:00
Steve Groesz
e66a02b18b
Update netapi reference
...
Resolves issue #18760
2014-12-11 18:14:47 -06:00
Metin OSMAN
d0799a864c
Update documentation
2014-12-11 22:25:29 +01:00
Thomas Jackson
f268bb8b4b
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
68c0dc0717
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
9523435ee4
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
4df8db515c
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
e32a7e1ed7
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Thomas Jackson
9db7f8f7e9
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
2afd4c8c04
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
d12677156e
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
3859204103
Fix typo in renderers doc, the directory name was wrong
2014-12-10 18:42:16 -08:00
Nitin Madhok
c299f4119a
Adding pillar to toctree
2014-12-08 10:52:38 -05:00
Nitin Madhok
f168af05ef
Adding state to toctree
2014-12-08 10:50:09 -05:00
Nitin Madhok
67fd828708
Adding modules to toctree
2014-12-08 10:34:33 -05:00
Colton Myers
472f6577e2
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/minion.py
salt/modules/localemod.py
salt/states/mount.py
salt/transport/__init__.py
salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Thomas S Hatch
1bfed11756
Merge pull request #18541 from cachedout/event_return
...
Event return
2014-12-03 09:56:33 -07:00
Seth House
54d8760d2d
Added docs for the state-level aggregate keyword
...
Also added clarification on the two ways to invoke the aggregation
function.
2014-12-02 18:33:10 -05:00
Pedro Algarvio
50105aa001
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
tests/unit/modules/boto_vpc_test.py
2014-12-01 23:07:39 +00:00
Elias Probst
6a7662c498
Fix typo (agregate → aggregate).
2014-11-29 15:58:07 +01:00
Mike Place
8297c2c48e
Documentation
2014-11-26 16:56:45 -07:00
Thomas S Hatch
2e3089410a
Merge pull request #18514 from cachedout/issue_16879
...
Update docs for unless
2014-11-26 09:29:24 -07:00
Thomas S Hatch
6aa5b0f858
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/genesis.py
salt/modules/parted.py
salt/modules/win_service.py
salt/runner.py
salt/states/file.py
tests/integration/netapi/rest_tornado/test_app.py
2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d
Update docs for unless
...
Note that unless is run for each associate state dec.
2014-11-26 09:17:14 -07:00
rallytime
73f3c0091d
Clean up doc build so it doesn't stacktrace
...
Fixes #18471
- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
2014-11-25 15:11:15 -07:00
Nitin Madhok
93700aa642
Fixing sphinx errors and violations
2014-11-25 15:01:30 -05:00
Konrad Starzyk
0759323c99
Merge remote-tracking branch 'upstream/develop' into jboss7
2014-11-25 11:52:27 +01:00
Colton Myers
754baafcf7
Merge branch '2014.7' into develop
2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8
Add warning to docs about topfile compilation
...
Ref #12483
2014-11-24 14:33:37 -07:00
Konrad Starzyk
99406c2215
Merge remote-tracking branch 'upstream/develop' into jboss7
2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7
Documentation fixes for jboss7 and artifactory states/modules
2014-11-20 11:16:57 +01:00
pengyao
3ffa0dfc6b
Url should be '/keys'
2014-11-20 11:16:58 +08:00
Colton Myers
716a7e3331
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Nitin Madhok
5d8ae4e32f
Fixing sphinx violations and errors
2014-11-18 02:53:40 -05:00
Colton Myers
b2a2facb27
Add one additional folder and clarification to client_acl docs
2014-11-17 14:55:08 -07:00
Thomas Jackson
6d2fbc8715
Documentation for saltnado
2014-11-13 08:36:29 -08:00
Chris Martin
d03a2bf753
Remove an awkward comma splice in the docs.
2014-11-10 20:02:02 -08:00
Thomas S Hatch
b3d2edc9a5
Merge branch '2014.7' into develop
2014-11-04 15:11:23 -07:00
Colton Myers
df0547969f
We evaluate a prereq, we don't call it. Fixes #17086
2014-11-04 11:36:30 -07:00
Henrik Holmboe
1f3ba9ced5
Add possible values to arguments in Salt man-page
2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2
Typo jod -> job
2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837
Choose vs chose typo
2014-11-03 20:54:39 +01:00
