valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,320 Commits 24 Branches 182 Tags 341 MiB
7554d0f42d
Commit Graph

22 Commits

Author SHA1 Message Date
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
Erik Johnson
d649551fbf Merge branch '2015.5' into 2015.5-2015.8 2016-01-24 11:55:09 -06:00
Jacob Hammons
03c51bb54d Added placeholder release notes for 2015.5.10 
Changed old doc links from docs.saltstack.org to docs.saltstack.com
 2016-01-22 10:48:08 -07:00
Tyler Cipriani
db793dd0de Update salt vagrant provisioner info 
Also tweaked one piece of confusing verbiage
 2015-05-27 21:56:29 -06:00
Tyler Cipriani
8ec82b640d Update salt vagrant provisioner info 
Also tweaked one piece of confusing verbiage
 2015-05-27 11:13:29 -07:00
Mike Place
56bac362fd Change bootstrap instructions to two liner 2015-03-09 18:24:53 -06:00
Thomas Jackson
c18e834be1 Fix trailing whitespace 
Conflicts:
	doc/topics/tutorials/states_pt2.rst
 2014-12-11 07:53:19 -08:00
Tim O'Guin
41978cc449 updated masterless documentation to clarify the need to disable (or not run) the salt-minion daemon, otherwise the minion will attempt to connect to a master 2014-10-03 01:35:28 -04:00
Thomas S Hatch
996bae04cd Add clarity note in the docs 2014-08-07 12:08:14 -06:00
Erik Johnson
16d59eb135 Fix rst note:: directives 2014-07-13 10:40:53 -05:00
Pedro Algarvio
506cbe4726 Make use of the bootstrap.saltstack.com URL(s) 2014-06-07 13:59:39 +01:00
Michael Lustfield
5eab3db366 minor doc touchups 2014-05-24 23:42:00 -05:00
Forrest Alvarez
b588393a7b Updated the quickstart so we can get rid of the standalone minion docs. 2014-05-21 03:33:09 +00:00
Chris Rebert
8af229253f more copyediting 2014-04-30 13:55:48 -07:00
Pedro Algarvio
f0dddbbc82 Remove references to the insecure redirect. 2014-04-30 00:25:59 +01:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http" 
This reverts commit 6fc260be9e.
 2014-04-27 11:46:36 +01:00
Daniel Wallace
6fc260be9e Default to https instead of http 
For everything that doesn't use python urllib
 2014-04-26 20:20:32 -05:00
Mike Place
cdd163569c Improvements to clarity and readability. New YAML page, currently unlinked. 2014-02-12 17:15:05 -07: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
567a1edac7 Misc rST fixes 2013-01-23 23:40:24 -07:00
Alec Koumjian
1f02f680c3 Create quickstart.rst 2012-12-13 15:07:10 -08:00