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
Joseph Hall
7ee6103007
Adding and updating Stormpath modules
2015-04-17 08:37:23 -06: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
Mike Place
56bac362fd
Change bootstrap instructions to two liner
2015-03-09 18:24:53 -06: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
94d55889d7
Resolve merge conflicts
2015-02-28 12:35:25 -06:00
Erik Johnson
c734a7db18
Update LXC tutorial to reflect function name change
2015-02-27 23:10:22 -06:00
Erik Johnson
341b6622c8
gitfs: Add warning about ssh:// URLs (dulwich)
2015-02-27 14:53:57 -07:00
Erik Johnson
4ce8a9d064
Improve salt fileserver documentation
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
ff66ad3d11
Correct location of network configuration for Debian/Ubuntu
2015-02-27 18:16:13 +01:00
Erik Johnson
48fed17876
Add warnings about static IP configuration
2015-02-27 18:12:18 +01:00
Erik Johnson
a2452aa611
gitfs: Add warning about ssh:// URLs (dulwich)
2015-02-24 22:37:30 -06:00
Erik Johnson
db85cd43f7
Improve salt fileserver documentation
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
f00465a8a1
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
2015-02-18 11:55:29 -07:00
Dennis Hall
478f42d9b2
Change Github to GitHub
2015-02-15 15:19:54 +01:00
Dennis Hall
5cf8e389d4
Change Adjective in Starting States Tutorial
...
The line which compares the previous two examples to the following YAML
example should use a demonstrative adjective like 'these'.
2015-02-11 10:44:46 +01:00
Erik Johnson
89a58ac4c2
Update the LXC tutorial
...
This updates the tutoral to reflect the new profile merging behavior.
2015-02-10 15:06:47 -06:00
Erik Johnson
1530470339
No need to mention that Debian Jessie hasn't been released
2015-02-10 15:06:46 -06:00
Erik Johnson
10238f8be7
Add warnings about creating containers from rootfs image
2015-02-10 15:06:46 -06:00
Erik Johnson
1ea87ccaa9
Formatting tweak (for consistency)
2015-02-10 15:06:46 -06:00
Erik Johnson
a8fe526d20
Replace references to "next feature release" with 2015.2.0
2015-02-10 15:06:46 -06:00
Erik Johnson
832df20df2
Complete initial draft of LXC tutorial
...
This will need to be filled out, but this is a good starting point.
2015-02-10 15:06:45 -06:00
Erik Johnson
c4fc5f5fa4
More info for LXC tutorial
2015-02-10 15:06:45 -06:00
Erik Johnson
2dad71adc9
Add more info to LXC tutorial
2015-02-10 15:06:45 -06:00
Erik Johnson
196a7d6327
Stub for LXC tutorial
2015-02-10 15:06:43 -06:00
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Seth House
15936658ba
Added cross-references to other ways to preseed minion keys
2015-02-05 19:15:46 -07:00
Thomas S Hatch
e742d995ea
Merge pull request #20332 from westurner/patch-2
...
DOC: topics/tutorials/walkthrough.rst: then > than
2015-02-03 06:20:10 -07:00
Wes Turner
203f5c3798
DOC: topics/tutorials/walkthrough.rst: then > than
2015-02-03 05:42:50 -06:00
Diego Woitasen
e6f64019a8
How to store Minion config options on Pillars.
2015-02-02 09:27:13 -03:00
rallytime
9898fcf613
Merge branch '2015.2' into 'develop'
...
Conflicts:
.gitignore
.pylintrc
.testing.pylintrc
salt/client/mixins.py
salt/cloud/clouds/msazure.py
salt/config.py
salt/modules/mount.py
salt/runners/doc.py
salt/utils/event.py
salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
Joseph Hall
f5e8b4a10e
Don't default CA bundle updates to a non-standard location
2015-01-28 20:09:13 -07:00
Joseph Hall
f846925ba7
Document text_out and headers_out
2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe
Document updating CA bundles
2015-01-28 10:51:04 -07:00
Colton Myers
8bba4bbec4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cloud/clouds/msazure.py
salt/modules/boto_sns.py
salt/states/boto_sns.py
tests/integration/modules/boto_sns.py
tests/integration/states/boto_sns.py
2015-01-23 14:20:34 -07: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
Colton Myers
9446633e9d
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-01-21 12:05:51 -07:00
Joseph Hall
483e84c78a
Update HTTP tutorial for new functionality
2015-01-21 09:20:11 -07:00
Thomas S Hatch
dca509eb0d
Merge pull request #19859 from twellspring/develop
...
Documentation fix for Issue 19513.
2015-01-20 16:06:03 -07:00
Colton Myers
88fb2e0036
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/tutorials/starting_states.rst
salt/modules/linux_lvm.py
2015-01-20 15:19:53 -07:00
Colton Myers
1fb6fc0ba1
Fix the explanation of the Default Data - YAML section of starting states
2015-01-20 15:03:54 -07:00
