You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ur...@apache.org on 2022/02/15 08:48:57 UTC
[pulsar-site] 01/01: Merge branch 'main' into docs-sync
This is an automated email from the ASF dual-hosted git repository.
urfree pushed a commit to branch docs-sync
in repository https://gitbox.apache.org/repos/asf/pulsar-site.git
commit a19442d725cbff8dd22161fdef0db9b59e105e88
Merge: 9923645 328d2cb
Author: LiLi <ur...@apache.org>
AuthorDate: Tue Feb 15 16:48:42 2022 +0800
Merge branch 'main' into docs-sync
.github/workflows/ci-pulsar-website-build.yaml | 4 ----
.github/workflows/ci-pulsar-website-docs-sync.yaml | 4 ++++
.github/workflows/ci-pulsar-website-next-build.yaml | 4 ----
site2/website/versioned_docs/version-2.7.2/deploy-bare-metal.md | 2 +-
site2/website/versioned_docs/version-2.8.0/deploy-bare-metal.md | 2 +-
site2/website/versioned_docs/version-2.8.1/deploy-bare-metal.md | 2 +-
site2/website/versioned_docs/version-2.8.2/deploy-bare-metal.md | 2 +-
site2/website/versioned_docs/version-2.9.0/deploy-bare-metal.md | 2 +-
site2/website/versioned_docs/version-2.9.1/deploy-bare-metal.md | 2 +-
9 files changed, 10 insertions(+), 14 deletions(-)
diff --cc .github/workflows/ci-pulsar-website-docs-sync.yaml
index 88c441a,a232163..114317c
--- a/.github/workflows/ci-pulsar-website-docs-sync.yaml
+++ b/.github/workflows/ci-pulsar-website-docs-sync.yaml
@@@ -17,7 -17,7 +17,11 @@@
# under the License.
#
++<<<<<<< HEAD
+name: CI - Pulsar Website-Next build
++=======
+ name: CI - Pulsar Website Docs Sync from apache/pulsar
++>>>>>>> main
on:
push:
branches: [docs-sync]