Erik Johnson
175ba127be
Merge branch '2014.7' into 2014.7-2015.2
...
Conflicts:
salt/modules/archive.py
2015-01-14 14:26:22 -06:00
rallytime
4a1a5123f2
Remove old --out options from salt-cloud docs
...
Fixes #19453
2015-01-13 21:39:27 -07:00
Colton Myers
2a6c9a8165
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/ssh/index.rst
2015-01-13 11:58:58 -07:00
David\ Beitey
839968f637
Expand documentation about Saltfile for salt-ssh
2015-01-13 16:50:29 +10:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Mike Place
b419366443
Release note note
...
Fixes #18551
2015-01-08 16:41:20 -07:00
twellspring
f8883cebdd
Add private subnets
...
Added how to enable rackspace private subnets on servers instantiated by salt cloud
2015-01-02 19:28:45 -08:00
Colton Myers
cc74c400b9
Add docs for mine in salt-ssh
2014-12-23 12:14:31 -07:00
Colton Myers
139bd8df5b
Add salt-ssh mine to lithium release notes
2014-12-23 11:35:40 -07:00
Colton Myers
321413e638
Rename lithium release notes to 2015.2.0
2014-12-23 11:34:52 -07:00
Colton Myers
dc778a8e5e
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
salt/states/boto_secgroup.py
2014-12-23 10:57:26 -07:00
Colton Myers
f2fd892dc5
Merge pull request #19145 from whiteinge/sphinx-fixups
...
Minor Sphinx fixups
2014-12-22 16:25:01 -07:00
Colton Myers
7fc1cc2ba2
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/topics/releases/2014.7.1.rst
salt/modules/mdadm.py
salt/modules/mine.py
salt/modules/win_firewall.py
salt/modules/win_groupadd.py
salt/modules/win_service.py
salt/modules/win_system.py
salt/modules/win_useradd.py
salt/runners/jobs.py
tests/unit/modules/mdadm_test.py
2014-12-22 13:33:53 -07:00
rallytime
b43519b882
Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1
...
Fixes #19146
2014-12-19 16:00:30 -07:00
Seth House
a8e8111c92
Add a cross-ref to the vmbuilder formula repo
2014-12-19 14:34:58 -07:00
Seth House
d2e9378084
Switch html_title to empty string instead of None
2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f
Switch the :formula: extlink to :formula_url:
...
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
2014-12-19 14:34:57 -07:00
Seth House
f345188d06
Set minimum Sphinx version to 1.3
2014-12-19 14:34:57 -07:00
Colton Myers
9d5e05a381
Add more release notes for 2014.7.1
2014-12-18 14:19:52 -07:00
Thomas S Hatch
1dcc05b049
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/yumpkg.py
2014-12-17 15:00:26 -07:00
Thomas S Hatch
45365c095e
Merge pull request #19029 from basepi/merge-forward
...
Merge forward from 2014.7 to develop
2014-12-17 14:48:01 -07:00
Joseph Hall
bc58c569ab
Update docs for impacket dep
2014-12-17 11:45:49 -07:00
rallytime
926c486587
Correct master_sign_key_name reference
...
Fixes #19053
2014-12-17 11:32:23 -07:00
Colton Myers
e0b6f1623c
Add publish wrapper to lithium release notes
2014-12-16 16:13:03 -07:00
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
Seth House
c0567bab0f
Updated Formula Best Practices doc with several recommendations
2014-12-12 17:43:00 -07:00
Seth House
d0f038eec0
Minor clarification to not pointing directly to formulas repos
2014-12-12 17:42:54 -07:00
Seth House
e7922758ae
Minor rST formatting
2014-12-12 17:42:53 -07:00
Thomas Jackson
4d41fa35a1
Comma cleanup
2014-12-12 11:40:36 -08:00
Thomas Jackson
2bd05998b3
Comma cleanup
2014-12-12 11:40:10 -08:00
Thomas Jackson
2fa6dad350
Comma cleanup
2014-12-12 11:39:55 -08:00
Thomas Jackson
fb7e5630d8
Comma cleanup
2014-12-12 11:39:40 -08:00
Thomas Jackson
f0aae727ce
Comma cleanup
2014-12-12 11:39:07 -08:00
Thomas Jackson
d5d0a35297
Comma cleanup
2014-12-12 11:38:50 -08:00
Thomas Jackson
57933e9148
Comma cleanup
2014-12-12 11:38:18 -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 Jackson
c1860f3dd9
Comma cleanup
2014-12-12 11:32:58 -08:00
Thomas Jackson
8b635fe07d
Comma Cleanup
2014-12-12 11:32:16 -08:00
Thomas Jackson
3f4b2cc8bb
Comma cleanup
2014-12-12 11:31:43 -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
Joseph Hall
7099c02a53
Add serial commas to the style guide
2014-12-12 03:30:11 -07:00
Steve Groesz
e66a02b18b
Update netapi reference
...
Resolves issue #18760
2014-12-11 18:14:47 -06:00
Thomas S Hatch
16b4c9eb74
Merge pull request #18904 from MrCitron/feature-18866
...
Feature 18866
2014-12-11 17:04:39 -07:00
Steve Groesz
6cb313533b
Fix missing text
...
Found missing colon, causing code blocks not to display. This fixes issue #18879
2014-12-11 17:29:31 -06:00
Metin OSMAN
d0799a864c
Update documentation
2014-12-11 22:25:29 +01:00
