From b373c71918314c83b75e2df9c265831604011a1d Mon Sep 17 00:00:00 2001 From: nastasha-solomon <79124755+nastasha-solomon@users.noreply.github.com> Date: Tue, 3 May 2022 09:19:42 -0400 Subject: [PATCH 1/2] [DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.2 (#2099) (cherry picked from commit d2ee442f9d6fb0f1aa326d01481c302b6b38cbdd) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc --- docs/en/install-upgrade/breaking.asciidoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index ea33aa078..9d8102682 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -67,11 +67,17 @@ include::{es-repo-dir}/migration/migrate_8_2.asciidoc[tag=notable-breaking-chang ++++ This list summarizes the most important breaking changes in {elastic-sec} {version}. For +<<<<<<< HEAD the complete list, go to {security-guide}/release-notes.html[{elastic-sec}} release notes]. //{security-guide}/release-notes-header-8.1.0.html#breaking-changes-8.1.0[{elastic-sec} breaking changes]. //include::{security-repo-dir}/release-notes/8.1.asciidoc[tag=breaking-changes] +======= +the complete list, go to {security-guide-all}/8.2/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes]. + +include::{security-repo-dir}/release-notes/8.2.asciidoc[tag=breaking-changes] +>>>>>>> d2ee442 ([DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.2 (#2099)) [[kibana-breaking-changes]] === {kib} breaking changes From 187a0bafd9fb99283405ec1164eee4a116cd7b59 Mon Sep 17 00:00:00 2001 From: "nastasha.solomon" Date: Tue, 3 May 2022 09:48:22 -0400 Subject: [PATCH 2/2] Fixing conflict --- docs/en/install-upgrade/breaking.asciidoc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index 9d8102682..2c9b7c659 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -66,18 +66,9 @@ include::{es-repo-dir}/migration/migrate_8_2.asciidoc[tag=notable-breaking-chang {elastic-sec} ++++ -This list summarizes the most important breaking changes in {elastic-sec} {version}. For -<<<<<<< HEAD -the complete list, go to -{security-guide}/release-notes.html[{elastic-sec}} release notes]. -//{security-guide}/release-notes-header-8.1.0.html#breaking-changes-8.1.0[{elastic-sec} breaking changes]. - -//include::{security-repo-dir}/release-notes/8.1.asciidoc[tag=breaking-changes] -======= -the complete list, go to {security-guide-all}/8.2/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes]. +This list summarizes the most important breaking changes in {elastic-sec} {version}. For the complete list, go to {security-guide-all}/8.2/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes]. include::{security-repo-dir}/release-notes/8.2.asciidoc[tag=breaking-changes] ->>>>>>> d2ee442 ([DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.2 (#2099)) [[kibana-breaking-changes]] === {kib} breaking changes