whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge master to 1.10, with fixes (#7682)

Browse Source
This commit is contained in:
Jennifer Rondeau
2018-03-08 14:03:55 -05:00
committed by zacharysarah
parent 7f40782850
commit 3d79703d23
60 changed files with 26896 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_data/tasks.yml
+6
View File
@@ -186,6 +186,7 @@ toc:
- docs/tasks/administer-cluster/configure-multiple-schedulers.md
- docs/tasks/administer-cluster/ip-masq-agent.md
- docs/tasks/administer-cluster/dns-custom-nameservers.md
<<<<<<< HEAD
<<<<<<< HEAD
- docs/tasks/administer-cluster/dns-debugging-resolution.md
- docs/tasks/administer-cluster/pvc-protection.md
@@ -193,6 +194,11 @@ toc:
||||||| merged common ancestors
- docs/tasks/administer-cluster/pvc-protection.md
=======
||||||| merged common ancestors
=======
- docs/tasks/administer-cluster/dns-debugging-resolution.md
- docs/tasks/administer-cluster/pvc-protection.md
>>>>>>> merge master to 1.10, with fixes (#7682)
- docs/tasks/administer-cluster/storage-object-in-use-protection.md
>>>>>>> add pv protection description (#7620)