rallytime
|
8111909bb1
|
Merge branch '2016.3' into '2016.11'
Conflicts:
- doc/topics/master_tops/index.rst
- salt/runners/saltutil.py
|
2017-04-03 10:41:01 -06:00 |
|
Mike Place
|
bda781d8f9
|
Grammar fix
|
2017-03-31 14:02:48 -06:00 |
|
Erik Johnson
|
0d7b0c4ef0
|
Improve the master_tops documentation
|
2017-03-30 11:56:15 -05:00 |
|
rallytime
|
c6e191ad0d
|
Remove doc markup references from 2016.11 branch
|
2016-12-19 15:14:37 -07:00 |
|
rallytime
|
513058945c
|
Merge branch '2016.3' into '2016.11'
Conflicts:
- doc/ref/states/requisites.rst
- doc/topics/cloud/profitbricks.rst
- doc/topics/cloud/vsphere.rst
- doc/topics/releases/0.9.8.rst
- doc/topics/releases/releasecandidate.rst
- salt/cloud/clouds/vsphere.py
- salt/minion.py
- salt/states/archive.py
- tests/unit/states/archive_test.py
|
2016-12-19 14:58:39 -07:00 |
|
rallytime
|
4aafa41d22
|
Remove ":doc:" references from a bunch of doc/* files
|
2016-12-15 16:09:27 -07:00 |
|
rallytime
|
6e32267d0c
|
Remove ":doc:" references in salt/* files
|
2016-12-15 14:03:56 -07:00 |
|
Javier Bértoli
|
9c587c477d
|
Add example in the docs for varstack as a master_tops
|
2016-06-03 06:58:30 -03: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 |
|
Thomas Jackson
|
498a612078
|
Whitespace cleanup
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
|
2014-12-11 07:53:19 -08:00 |
|
rallytime
|
9e5350c2f4
|
Fix markup so master_tops document will render correctly
Fixes #18723
|
2014-12-05 20:47:41 -07:00 |
|
C. R. Oldham
|
6b52ca55a3
|
Restore master_tops functionality and add more documentation.
|
2014-07-09 14:37:59 -06:00 |
|
Henrik Holmboe
|
4fe8c529c0
|
Some minor changes to the documentation
|
2013-09-04 14:48:17 +02:00 |
|
martin f. krafft
|
c7053e9adf
|
Reclass master_tops/ext_pillar docs update
Signed-off-by: martin f. krafft <madduck@madduck.net>
|
2013-07-01 15:01:11 +02:00 |
|
Thomas S Hatch
|
267566af17
|
Fix typo in master_tops doc
|
2012-10-17 22:39:25 -06:00 |
|
Thomas S Hatch
|
4efa1d69de
|
Add master_tops doc
|
2012-10-16 16:11:11 -06:00 |
|