Commit 520173e

committed

resolved conflict: ours contains same conflicted line and release example updates

2 parents 16ea406 + 4beb9e5 commit 520173eCopy full SHA for 520173e

39 files changed

+1773

-888

lines changed

assets
- images
  - nav_logo2.svg
- scss
  - _custom.scss
content
- en
  - blog/_posts/2024-10-28-k8s-upstream-training-japan-spotlight
    - index.md
    - ood-2022-01.png
  - community/static
    - cncf-code-of-conduct.md
  - docs
    - concepts
      - cluster-administration
        cluster-autoscaling.md
      - extend-kubernetes/compute-storage-net
        device-plugins.md
      - security
        application-security-checklist.md
      - services-networking
        cluster-ip-allocation.md
    - reference/using-api
      - deprecation-policy.md
- ja/blog/_posts/2024-10-28-k8s-upstream-training-japan-spotlight
  - index.md
  - ood-2022-01.png
- uk/docs
  - _index.md
  - concepts/extend-kubernetes
    - _index.md
    - operator.md
  - home
    - _index.md
    - supported-doc-versions.md
- zh-cn
  - community/static
    - cncf-code-of-conduct.md
  - docs
    - concepts
      - architecture
        _index.md
        garbage-collection.md
      - cluster-administration
        cluster-autoscaling.md
    - contribute/style/hugo-shortcodes
      - index.md
    - reference
      - command-line-tools-reference/feature-gates
        api-priority-and-fairness.md
        csi-migration-rbd.md
        in-tree-plugin-rbd-unregister.md
        job-ready-pods.md
        skip-read-only-validation-gce.md
      - config-api
        imagepolicy.v1alpha1.md
      - glossary
        duration.md
      - setup-tools/kubeadm
        kubeadm-join.md
      - using-api
        api-concepts.md
        deprecation-policy.md
    - tasks/debug/debug-cluster
      - audit.md
layouts
- partials
  - head.html
- shortcodes
  - glossary_tooltip.html
static
- css
  - community.css
- images

39 files changed

+1773

-888

lines changed

`‎assets/images/nav_logo2.svg`

Loading

Comments

(0)