Thomas S Hatch
e34e81f41b
Merge branch '2014.7' into develop
...
Conflicts:
salt/minion.py
2014-09-05 11:03:12 -06:00
Thomas S Hatch
abc1c037ac
Merge pull request #15522 from rallytime/multimaster_docs
...
Update multimaster tutorial
2014-09-04 14:11:52 -06:00
Joseph Hall
f4a9e4df07
Merge pull request #15524 from hulu/typos
...
fix typos in doc/topics/jobs/job_cache.rst
2014-09-04 14:00:46 -06:00
Colton Myers
57e187d46f
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/mount.py
2014-09-04 13:45:03 -06:00
Chris Rebert
3053248b67
fix typos in doc/topics/jobs/job_cache.rst
2014-09-04 12:16:45 -07:00
rallytime
e5a1876462
Update multimaster tutorial
2014-09-04 12:58:19 -06:00
Thomas S Hatch
04c1822038
Merge pull request #15497 from basepi/bp-15410
...
Backport #15410 to 2014.7
2014-09-04 11:06:54 -06:00
Henrik Holmboe
c43a99242c
Minor doc change
2014-09-04 17:27:02 +02:00
rallytime
86be50c876
Add libcloud dependency notice to provider docs
2014-09-03 20:10:51 -06:00
David Boucha
a2cc5cbaaa
fix grammar
2014-09-03 16:40:05 -06:00
David Boucha
bc7b3289e8
fix some misspellings and grammar
2014-09-03 16:40:05 -06:00
Nitin Madhok
ef05362c6c
Fixing more sphinx errors and violations
2014-09-03 16:05:36 -06:00
Nitin Madhok
6ce392b236
More sphinx errors and violations
2014-09-03 16:05:07 -06:00
Thomas S Hatch
53855f7886
Add doc on job cache
2014-09-03 15:36:48 -06:00
Thomas S Hatch
2f6ae96f37
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
2014-09-03 14:43:07 -06:00
Erik Johnson
3c800cdd5f
Add pygit2 install link to gitfs walkthrough
2014-09-02 23:33:11 -05:00
Thomas S Hatch
1d85209c7f
Merge pull request #15456 from cachedout/eauth_clarify
...
Clarify a point about runners and eauth
2014-09-02 17:33:48 -06:00
Colton Myers
4214f8dc2b
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/network.py
2014-09-02 16:35:03 -06:00
Mike Place
350b6f853a
Typo
2014-09-02 16:19:59 -06:00
Mike Place
3075b1fd33
Clarify a point about runners and eauth
2014-09-02 15:56:25 -06:00
Erik Johnson
510942d3ec
Remove references to masterless salt from gitfs docs
...
Alternate backends do not yet work with the local fileclient.
2014-09-02 15:59:05 -05:00
Erik Johnson
9b2fc52e93
Fix duplicate word
2014-09-02 15:31:13 -05:00
Erik Johnson
ac944272e0
Fix spelling error
2014-09-02 15:27:44 -05:00
Mike Place
8c737afa1e
Merge branch '2014.7' into develop
...
Conflicts:
salt/utils/cloud.py
2014-09-02 14:20:04 -06:00
Erik Johnson
ba3e0367c6
Remove extraneous word
2014-09-02 15:16:32 -05:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
0a5bc21b58
More gitfs documentation clarifications/corrections
2014-09-02 14:37:52 -05:00
Erik Johnson
0ae4a108b7
Clarify outdated information in gitfs walkthrough
...
This paragraph predates the addition of pygit2 and dulwich support, and
seems to suggest that GitPython is required for gitfs, when that is no
longer necessarily true. This commit clarifies the wording here.
2014-09-02 13:22:56 -05:00
Colton Myers
36ef47e7a2
Merge branch '2014.7' into develop
...
Conflicts:
conf/minion
salt/modules/mine.py
2014-09-02 10:43:31 -06:00
Thomas S Hatch
b438e60469
Merge pull request #15339 from whiteinge/doc-back-ports
...
Added instructions on how to back-port fixes to release branches
2014-09-02 08:36:13 -06:00
Joseph Hall
e28468d930
Merge pull request #15342 from fly/li-pubkey
...
add support for ssh pubkey deployments using Linode
2014-09-02 08:30:52 -06:00
Jille Timmermans
4064a8cf4c
Fix some documentation inconsistencies
2014-09-02 11:38:23 +02:00
Erik Johnson
892a78ea1c
Double-backticks for formatting consistency
2014-09-01 15:07:03 -05:00
Erik Johnson
036e1cbeb7
Merge pull request #15414 from Jille/fix-docs
...
Small documentation fix in pillars
2014-09-01 15:01:27 -05:00
Simon Schmidt
f4c9ec24de
Fix saltutil.refresh_pillar reference in Pillar tutorial
...
It used to reference `saltutil.pillar_refresh` which gives the error:
'saltutil.pillar_refresh' is not available.
2014-09-01 20:38:50 +02:00
Jille Timmermans
30bce1dafa
Small documentation fix in pillars
2014-09-01 13:13:12 +02:00
Nitin Madhok
b526ee2aab
Fixing more sphinx errors and violations
2014-09-01 02:44:27 -04:00
Nitin Madhok
938d8e90ee
More sphinx errors and violations
2014-09-01 02:33:15 -04:00
Joseph Hall
4e29954710
Update Esky docs for clarity, and remove 2nd person
2014-08-30 19:50:32 -06:00
Jon Chen
c3d86fe44c
also update other linode config doc
2014-08-27 23:27:52 -04:00
Jon Chen
f29fd0340e
s/ssh_private_key/ssh_key_file
2014-08-27 23:25:08 -04:00
Jon Chen
33ddb0d451
document new ssh_private_key config value
2014-08-27 23:13:00 -04:00
Daniel Wallace
14d45a25d2
document ssh_agent
2014-08-27 21:40:05 -05:00
Seth House
47efe38949
Added instructions on how to back-port fixes to release branches
2014-08-27 20:17:12 -06:00
Jon Chen
86a2808b34
document possibility of ssh_pubkey
2014-08-27 20:14:24 -04:00
Robert Fairburn
235695ee19
Specify the version that interface properties were added in doc/topics/cloud/aws.rst
2014-08-27 14:02:01 -06:00
Seth House
e1b39609c5
Merge pull request #15298 from terminalmage/update-release-notes
...
Normalize the 2014.7.0 release notes
2014-08-26 19:04:54 -06:00
Seth House
013453ef1f
Merge pull request #15301 from cachedout/pillar_merge
...
Docs on merging pillar keys
2014-08-26 17:18:35 -06:00
Erik Johnson
35c9f40c5d
fix bullet list
2014-08-26 17:58:32 -05:00
Erik Johnson
3388256da7
fix bullet list
2014-08-26 17:57:20 -05:00
