Closed NickLarsenNZ closed 4 months ago
Here was my diff btw, just to speed things up and see less errors:
diff --cc local-antora-playbook.yml
index 51050bde,4d2577be..00000000
--- a/local-antora-playbook.yml
+++ b/local-antora-playbook.yml
@@@ -17,10 -15,12 +17,26 @@@ content
- url: ./
branches:
- HEAD
++<<<<<<< Updated upstream
+ - release/23.11
+ - release/23.7
+ - release/23.4
+ - release/23.1
++||||||| Stash base
++ - release/24.7
++ - release/24.3
++ - release/23.11
++ - release/23.7
++ - release/23.4
++ - release/23.1
++=======
+ - release/24.7
+ - release/24.3
+ # - release/23.11
+ # - release/23.7
+ # - release/23.4
+ # - release/23.1
++>>>>>>> Stashed changes
# management tools
- url: https://github.com/stackabletech/stackable-cockpit.git
start_path: docs
@@@ -30,133 -30,164 +46,389 @@@
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
# internal operators
- url: https://github.com/stackabletech/commons-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/secret-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/listener-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
# product operators
- url: https://github.com/stackabletech/airflow-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/druid-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/hbase-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/hdfs-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/hive-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/kafka-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/nifi-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/opa-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/spark-k8s-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/superset-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/trino-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
- url: https://github.com/stackabletech/zookeeper-operator.git
start_path: docs
branches:
- main
++<<<<<<< Updated upstream
+ - release-23.11
+ - release-23.7
+ - release-23.4
+ - release-23.1
+
++||||||| Stash base
++ - release-24.7
++ - release-24.3
++ - release-23.11
++ - release-23.7
++ - release-23.4
++ - release-23.1
++=======
+ - release-24.7
+ - release-24.3
+ # - release-23.11
+ # - release-23.7
+ # - release-23.4
+ # - release-23.1
++>>>>>>> Stashed changes
ui:
bundle:
url: ./ui/build/ui-bundle.zip
Part of https://github.com/stackabletech/documentation/pull/635
01387e5958cfb2711efe2900b536aaf3bc48e649 fixes:
Remaining errors to fix in this PR:
There will be similar changes needed for other branches.