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
|
02bfe7912c
|
Remove more ":doc:" references from doc/* files
|
2016-12-15 15:36:44 -07:00 |
|
Mike Place
|
42c5058a1e
|
Add tcptraceroute suggestion to minion troubleshooting docs (#33862)
Closes #33627
|
2016-06-08 12:19:27 -04: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 |
|
Jacob Hammons
|
d45c4ed11f
|
Bug fixes and build errors
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
|
2015-06-05 17:32:35 -06: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 |
|
Forrest
|
5145e3b448
|
Fix a typo
|
2014-08-13 11:08:35 -07:00 |
|
Forrest Alvarez
|
c4e55d9b84
|
Update the master and minion guides to discuss timeout settings.
|
2014-08-13 04:54:11 +00:00 |
|
Thomas S Hatch
|
10a475ded2
|
Documentation to fix #6300
|
2014-05-14 13:56:54 -06:00 |
|
Erik Johnson
|
84c6b62005
|
More refinement of master/minion troubleshooting docs
Added an nmap example for checking if ports are open, removed some
redundant wording, and reworded other parts to be more concise.
|
2013-12-29 20:13:11 -06:00 |
|
Forrest Alvarez
|
ef303d2807
|
Fixed a typo in the troubleshooting index, copied over some content from the index to both the master and the minion, and cleaned them up to be more relevant to each.
|
2013-12-23 05:43:58 +00:00 |
|
Forrest Alvarez
|
17c8af56c9
|
Made some more updates to the master and minion troubleshooting docs to get rid of errors.
|
2013-12-21 06:38:47 +00:00 |
|
Forrest Alvarez
|
b3c6c6b56e
|
Updated the contents.rst so it pulls in more info from the topics, added some preliminary data for the master/minion docs so it stops erroring, did not delete the relevant sections from the main index.
|
2013-12-21 06:19:45 +00:00 |
|
Forrest Alvarez
|
f77cc4e68f
|
Updated the index of the troubleshooting docs with some new links to master and minion docs, added those, did not add content yet.
|
2013-12-16 06:09:12 +00:00 |
|