valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,933 Commits 24 Branches 182 Tags 341 MiB
4fa80f2d5e
Commit Graph

68 Commits

Author SHA1 Message Date
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/ssh/index.rst
 2016-01-05 16:11:20 -07:00
Mike Place
8c29e2dd6a Document that gitfs needs recent libs 
Closes #29921
 2015-12-30 12:00:33 -07:00
Erik Johnson
139f5ba4c3 Add warning about pygit2 API instability 2015-11-20 22:34:58 -06:00
Erik Johnson
ee1eac925a Point git_pillar section in gitfs tutorial at git_pillar docstring 2015-08-19 15:23:52 -05:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
TheBigBear
1d624d77bc minor edit 
get should have been git
 2015-08-08 15:26:21 +01:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
 2015-05-11 11:38:03 -06:00
Colton Myers
7729834d92 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/client/ssh/wrapper/__init__.py
 2015-05-06 15:45:11 -06:00
Erik Johnson
20006b06f6 Update Lithium docstrings in 2014.7 branch 2015-05-06 09:12:37 -05:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
 2015-04-21 10:42:22 -06:00
Colton Myers
1f9934c634 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
 2015-04-20 11:39:41 -06:00
Erik Johnson
98885f71d6 Add information about libssh2 requirement for pygit2 ssh auth 2015-04-17 13:24:14 -05:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Nicolas Delaby
b01dfa9150 Add a note regarding pkg-config to install libgit2 2015-03-20 16:25:35 +01:00
Elias Probst
583239b893
Suggest a separate repo for top.sls. 
This replaces the suggestion to keep `top.sls` out of other branches
which is rather unpractical, as it would require to manually delete
it from each new created branch and prevent deleting it when merging
the branch back into `master`.
 2015-03-08 09:50:20 +01:00
Erik Johnson
341b6622c8 gitfs: Add warning about ssh:// URLs (dulwich) 2015-02-27 14:53:57 -07:00
Erik Johnson
ccf99c7405 Add example of clearing gitfs cache pre-2015.2.0 2015-02-27 14:53:55 -07:00
Erik Johnson
815a1befa9 Add note about dulwich gitfs cache incompatibility 2015-02-27 14:53:55 -07:00
Erik Johnson
a2452aa611 gitfs: Add warning about ssh:// URLs (dulwich) 2015-02-24 22:37:30 -06:00
Erik Johnson
61cfed60a1 Add example of clearing gitfs cache pre-2015.2.0 2015-02-24 22:37:28 -06:00
Erik Johnson
5bb28b6969 Add note about dulwich gitfs cache incompatibility 2015-02-24 22:37:28 -06:00
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