valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,525 Commits 24 Branches 182 Tags 341 MiB
185856ddbb
Commit Graph

46 Commits

Author SHA1 Message Date
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
robert.fach
4f7b0a29d1 updated information regarding required version for dulwich gitfs backend 2015-01-22 17:14:27 +01:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
c18e834be1 Fix trailing whitespace 
Conflicts:
	doc/topics/tutorials/states_pt2.rst
 2014-12-11 07:53:19 -08:00
Erik Johnson
d2b3da6bd7 Add note about libssh2 optdepend for ssh access w/libgit2 
See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
 2014-11-18 22:08:29 -06:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Erik Johnson
90ba9b8a43 Add notice that per-remote auth params are not supported in GitPython 2014-10-18 17:36:51 -05:00
Erik Johnson
3c800cdd5f Add pygit2 install link to gitfs walkthrough 2014-09-02 23:33:11 -05: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
Erik Johnson
ba3e0367c6 Remove extraneous word 2014-09-02 15:16:32 -05: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
Erik Johnson
41a0753518 Add ssh_config example for GitPython 2014-08-25 12:06:29 -05:00
Erik Johnson
5444c68437 Update docs to reflect pygit2 auth support in 0.20.3 2014-08-20 23:54:48 -05:00
Erik Johnson
c8be676577 Update gitfs documentation 
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
 2014-08-20 21:36:44 -05:00
rallytime
8dcedf684d Change more affected docs from Helium to 2014.7.0 2014-07-15 17:02:19 -06:00
Erik Johnson
1b1eb26587 Add reactor example for updating fileserver on git push 2014-07-02 21:03:09 -05:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Erik Johnson
1a4e1c7944 Remove italics 
These are out-of-place in the context of the other steps in this
particular section, and thus unnecessary.
 2014-06-17 14:47:19 -05:00
Erik Johnson
dcaf2892f3 Clarify GitPython installation in gitfs tutorial 2014-06-03 10:40:27 -05:00
Erik Johnson
5cd4000862 Add information on gitfs_provider to gitfs walkthrough 2014-05-21 15:00:29 -05:00
Erik Johnson
93245d1e0e Correct inaccuracies in gitfs walkthrough 
Also, added some information on upcoming features
 2014-05-21 01:35:00 -05:00
Wes Turner
6aa523d9d1 DOC: Update GitFS documentation (syntax, links) 2014-04-22 05:42:10 -05:00
Erik Johnson
ac6648fdfa Clarify when the new "root" param for git_pillar will be added 2014-03-10 11:45:13 -05:00
Jens Rantil
f02f9ed8d9 doc(pillar/git): drop first person 
By request of @thath45.
 2014-03-02 12:51:20 +01:00
Jens Rantil
ea117cfdf5 doc(pillar/git): document setting custom root 2014-02-28 14:58:44 +01:00
Josh VanderLinden
7adb732854 Moving the GitPython note higher up 2014-02-23 23:55:48 -07:00
Erik Johnson
54d0241f58 Add warning re: gitfs cache in pre-Hydrogen releases 2014-02-08 15:36:45 -06:00
Erik Johnson
3f9c5d60fa Add note about ubuntu 12.04 not having sufficient GitPython for gitfs 2013-12-31 20:03:57 -06:00
Erik Johnson
4a8bd16787 Improve git_pillar documentation 
This adds a brief explanation of git_pillar to the gitfs walkthrough.
Even though they don't work the same, they do similar things for
file_roots and pillar_roots, and it bears mentioning.

Also, this adds a better explanation of how git_pillar works to the
top-level docstring for pillar/git_pillar.py.
 2013-10-28 17:09:38 -05:00
Erik Johnson
25d6d37f30 Version 0.16.4 is no longer in future tense 2013-10-12 11:35:02 -05:00
Forrest Alvarez
03285879d3 Updated the gitfs tutorial to mention that the salt-states repo does not have the latest releases of the states as it was mentioned that was confusing in the IRC today. 2013-09-25 02:53:55 +00:00
Sergio Visinoni
f95c0d67d7 Add cleaner explanation of environment mapping 
Explicitely state that the 'master' branch is automagically mapped
to the 'base' environment.

Also mention the fact that top.sls files are merged from the different
branches, which suggests a setup where top.sls is only present in
the 'master' branch.
 2013-09-19 17:00:46 -05:00
Erik Johnson
b603274ecd Add notes on GitPython issue in salt<=0.16.3 2013-09-05 13:43:08 -05:00
Erik Johnson
c4e85c63e9 Docs formatting fixes 2013-08-24 23:19:54 -05:00
Jason Sommer
201b4f8776 Added gitfs_root option 2013-08-17 20:14:57 -05:00
Erik Johnson
9c63495e04 Formatting fixes 
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
 2013-08-11 22:17:47 -05:00
Seth House
db4d7bcb59 Added rST anchors to pillar and GitFS for easy cross-referencing 2013-08-07 14:34:47 -06:00
Seth House
858df860c2 Wrapped file:// in literals 2013-07-01 13:42:58 -06:00
Valentin Bud
f9e74255d2 Update GitFS Backend Walkthrough to include GitFS over SSH 
A small description on how to configure GitFS over SSH transport.
 2013-05-24 10:36:56 +03:00
Colton Myers
cbd6492950 Add docs for file:// in gitfs 2013-05-07 11:21:26 -06:00
Gary Wilson Jr
bd499e5640 Fixed several minor misspellings and acronym capitalizations. 2013-03-18 16:42:57 -05:00
Gary Wilson Jr
cc72ebb1fb Fixed :doc: uses in the docs that were not rendering due to an extra space. 2013-03-18 16:42:56 -05:00
Thomas S Hatch
7ad7a28acc Add gitfs tutorial 2013-03-13 23:45:44 -06:00