valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,929 Commits 24 Branches 182 Tags 341 MiB
ee3c1bd4a7
Commit Graph

4105 Commits

Author SHA1 Message Date
Jacob Hammons
ee3c1bd4a7 missed one 2015-05-15 16:26:47 -06:00
Jacob Hammons
3872921dd0 More updates to sphinx2 theme 2015-05-15 16:26:11 -06:00
Jacob Hammons
8c32152be0 removed TOC numbering, additional tweaks to layout.html 2015-05-13 21:18:00 -06:00
Jacob Hammons
73dfaeff28 Merge branch '2015.5' of https://github.com/saltstack/salt into 2015.5 2015-05-13 21:16:36 -06:00
Mike Place
bdbbfa6ee7 Start on 2015.5.1 release notes 2015-05-13 12:31:41 -06:00
Jacob Hammons
16d8a753ad saltstack2 sphinx theme and build settings 2015-05-11 17:29:12 -06:00
David Boucha
5504778adf update to proper examples 2015-05-07 18:08:05 +00: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
Colton Myers
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-05-06 15:42:35 -06:00
Colton Myers
23d4feb8b4 Merge remote-tracking branch 'upstream/2015.2' into 2015.5 2015-05-06 13:51:10 -06:00
Justin Findlay
8074d16d52 2015.2 -> 2015.5 
Related to https://github.com/saltstack/salt-windows-dev/pull/10.
 2015-05-06 11:40:01 -06:00
Erik Johnson
d6b62f73a4 Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 11:13:13 -06:00
Erik Johnson
a7447ac681 Add missing RST file 2015-05-06 11:13:05 -06:00
Erik Johnson
23fa4402dc Update manpages to reflect 2015.2 rename to 2015.5 2015-05-06 12:08:46 -05:00
Erik Johnson
4fea5ba477 Add missing RST file 2015-05-06 12:06:49 -05:00
Erik Johnson
0504e7a184 Update Lithium docstrings in 2015.2 branch 2015-05-06 11:01:53 -06:00
Colton Myers
8510a4c30e Update to release notes from 2015.2 branch 2015-05-06 10:48:06 -06:00
Colton Myers
3255fbc0d5 Rename the release notes 2015-05-06 10:47:16 -06:00
Erik Johnson
d395565bf7 Update Lithium docstrings in 2015.2 branch 2015-05-06 09:27:40 -05:00
Erik Johnson
20006b06f6 Update Lithium docstrings in 2014.7 branch 2015-05-06 09:12:37 -05:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Colton Myers
b261c95cd6 Add note to 2015.2.0 release notes about master opts in pillar 2015-05-05 16:14:42 -06:00
Colton Myers
b2f033f485 Add CLI note 2015-05-05 16:02:26 -06:00
Colton Myers
48e7b3ee4f Add warning about python_shell changes to 2015.2.0 release notes 2015-05-05 15:54:50 -06:00
Thomas S Hatch
8c057e6794 Merge pull request #23335 from steverweber/2015.2 
2015.2: include doc in master config for module_dirs
 2015-05-05 15:28:58 -06:00
Colton Myers
c223309bb7 Add versionadded 2015-05-05 12:44:50 -06:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Colton Myers
c273ea14c6 Add minion config to salt-ssh doc 2015-05-04 14:48:19 -06:00
Colton Myers
a0b6b760c3 Add minion_opts to roster docs 2015-05-04 14:46:16 -06:00
Steve Weber
97513b060a include module_dirs 
include module_dirs
 2015-05-04 13:00:31 -04:00
Seth House
35c91881ab Added note about debugging reactor files to see the rendered output 2015-04-28 14:48:38 -06:00
Colton Myers
a8f797e0e4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-28 09:48:53 -06:00
rallytime
f6cc7c8f8a Adjust ZeroMQ 4 docs to reflect changes to Ubuntu 12 packages 
Removed the chrislea ppa third party installation information. This
shouldn't be needed anymore for any Ubuntu package after 2014.7.5.
 2015-04-27 15:57:41 -06:00
C. R. Oldham
63fafe961e Clarify the nature of auth and start events. 2015-04-24 12:46:32 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Justin
8486e17ab3 Added retry_dns to minion doc. 2015-04-23 15:33:59 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation 
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
 2015-04-23 10:22:11 +02:00
Thomas S Hatch
022a43aaa9 Merge pull request #22904 from jacobhammons/2015.2 
Regenerated man pages
 2015-04-21 12:51:48 -06:00
Jacob Hammons
99abfd7755 Regenerated man pages 2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397 Revert "Regenerated man pages" 
This reverts commit 069a0cac71.
 2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71 Regenerated man pages 2015-04-21 11:20:52 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
Pedro Algarvio
95d6887949 Don't fail on make clean just because the directory does not exist 2015-04-21 00:46:09 +01: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
Justin Findlay
900c7a510f Merge pull request #22800 from terminalmage/issue21979 
Improve error logging for pygit2 SSH-based remotes
 2015-04-18 11:18:55 -06:00
Justin Findlay
e99f2fdb28 Merge pull request #22813 from twangboy/win_doc_fix 
Updated instructions for building salt
 2015-04-17 22:10:07 -06:00
twangboy
adc421acdd Fixed some formatting issues 2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6 Updated instructions for building salt 2015-04-17 14:41:46 -06:00
rallytime
5931a582d1 Replace all 4s with 5s 2015-04-17 14:15:33 -06:00