From 3189841256ae5864a784a388a62a5c0d4c629896 Mon Sep 17 00:00:00 2001 From: Elastic Jasper Date: Tue, 13 Sep 2016 20:32:15 -0400 Subject: [PATCH] Backport PR #8229 --------- **Commit 1:** Update elasticsearch plugin to require ES to have the same version as Kibana. - Remove engineVersion from elasticsearch plugin config. - Use Kibana package.json version instead. - Use new rules, documented in README. - Log warning if ES is newer than Kibana. - Add isEsCompatibleWithKibana and kibanaVersion. - Remove versionSatisfies. * Original sha: 330e57d6d8590a8a0de068efdb6ac8f12d18478f * Authored by CJ Cenizal on 2016-09-09T22:36:09Z --- backport--instructions.rej | 83 ++++++++++++++++++++++++++++++++ backport-commit-message.rej | 14 ++++++ backport-guided-begin.rej | 12 +++++ backport-guided-finish.rej | 10 ++++ backport-wrangle-into-commit.rej | 12 +++++ 5 files changed, 131 insertions(+) create mode 100644 backport--instructions.rej create mode 100644 backport-commit-message.rej create mode 100755 backport-guided-begin.rej create mode 100755 backport-guided-finish.rej create mode 100755 backport-wrangle-into-commit.rej diff --git a/backport--instructions.rej b/backport--instructions.rej new file mode 100644 index 0000000000000..3c7d1229451c5 --- /dev/null +++ b/backport--instructions.rej @@ -0,0 +1,83 @@ +Backport of PR #8229 to branch 5.0 failed + +https://github.com/elastic/kibana/pull/8229 + + +- 1 patch failed to apply +- 11 patches were applied successfully + +------------------------------------- + +At this point, you need to manually resolve these conflicts on your machine and +push the changes back up to this upstream branch so the PR is updated with your +changes. The following instructions and scripts should help with that. + +All of the provided scripts assume that the remote "upstream" is where the +backport branch exists and that your local branch has the exact same name as +the upstream branch. + +First, check out this branch locally: + + git fetch upstream jasper/backport/8229/5.0 + git checkout jasper/backport/8229/5.0 + +Now, just follow one of these two paths: + + +1. GUIDED BACKPORT + +You should do the guided backport if you want to apply the backported changes +while resolving the conflicts on each commit. For most cases, this is what you +want to do. + +The following script will rebase the commits that need to be backported onto +a new temporary branch. Resolve any conflicts as you normally would during a +rebase. Do not remove these backport-*.rej files, and feel free to add +additional commits if that's necessary: + + sh backport-guided-begin.rej + +Once the conficts are resolved and the rebase is completed, the following +script will update the local backport branch with the changes, remove the +temporary branch that was created, remove the remnants of this backport commit +and squash the newly resolved commits (and any others you may have added) into +a single backport commit with the proper commit message: + + sh backport-guided-finish.rej + +At this point, you should be on the local backport branch, and it should be +exactly 1 commit ahead of the intended target. The commit message should be +very similar if not identical to the PR itself, and the changeset should +include all of the changes you intended to backport and none of these +backport-*.rej files. + +Now just replace the contents of the pull request with your local changes: + + git push -f upstream jasper/backport/8229/5.0 + + +2. ALMOST COMPLETELY MANUAL + +You should do this option if there are just so many conflicts that it's easier +to rebuild the entire changeset from scratch. You'll still work on the local +backport branch which should be up to date with the intended target. + +Feel free to add as many commits as you'd like and don't worry about fancy +commit messages - we're just going to squash them down and replace the message +when you're finished. + +Once the changes are committed on your local backport branch, the following +script will remove the remnants of this backport commit and squash the newly +created commits into a single backport commit with the proper commit message. + + sh backport-wrangle-into-commit.rej + +At this point, you should be on the local backport branch, and it should be +exactly 1 commit ahead of the intended target. The commit message should be +very similar if not identical to the PR itself, and the changeset should +include all of the changes you intended to backport and none of these +backport-*.rej files. + +Now just replace the contents of the pull request with your local changes: + + git push -f upstream jasper/backport/8229/5.0 diff --git a/backport-commit-message.rej b/backport-commit-message.rej new file mode 100644 index 0000000000000..e42c0eab81fdb --- /dev/null +++ b/backport-commit-message.rej @@ -0,0 +1,14 @@ +Backport PR #8229 +--------- + +**Commit 1:** +Update elasticsearch plugin to require ES to have the same version as Kibana. +- Remove engineVersion from elasticsearch plugin config. +- Use Kibana package.json version instead. +- Use new rules, documented in README. +- Log warning if ES is newer than Kibana. +- Add isEsCompatibleWithKibana and kibanaVersion. +- Remove versionSatisfies. + +* Original sha: 330e57d6d8590a8a0de068efdb6ac8f12d18478f +* Authored by CJ Cenizal on 2016-09-09T22:36:09Z \ No newline at end of file diff --git a/backport-guided-begin.rej b/backport-guided-begin.rej new file mode 100755 index 0000000000000..9f5b5e9411409 --- /dev/null +++ b/backport-guided-begin.rej @@ -0,0 +1,12 @@ +#!/bin/sh + +REMOTE="upstream" +BRANCH="jasper/backport/8229/5.0" +WORKING_BRANCH="tmp/$BRANCH" +STARTING_SHA="330e57d6d8590a8a0de068efdb6ac8f12d18478f" +ENDING_SHA="330e57d6d8590a8a0de068efdb6ac8f12d18478f" + +git fetch $REMOTE + +git checkout -b $WORKING_BRANCH $ENDING_SHA +git rebase $STARTING_SHA^ --onto $BRANCH diff --git a/backport-guided-finish.rej b/backport-guided-finish.rej new file mode 100755 index 0000000000000..f986cf2ee96c6 --- /dev/null +++ b/backport-guided-finish.rej @@ -0,0 +1,10 @@ +#!/bin/sh + +BRANCH="jasper/backport/8229/5.0" +WORKING_BRANCH="tmp/$BRANCH" + +git checkout $BRANCH +git reset --hard $WORKING_BRANCH +git branch -D $WORKING_BRANCH + +sh backport-wrangle-into-commit.rej diff --git a/backport-wrangle-into-commit.rej b/backport-wrangle-into-commit.rej new file mode 100755 index 0000000000000..b81b4a37f5182 --- /dev/null +++ b/backport-wrangle-into-commit.rej @@ -0,0 +1,12 @@ +#!/bin/sh + +REMOTE="upstream" +BRANCH="jasper/backport/8229/5.0" +COMMIT_MSG=`cat backport-commit-message.rej` + +git reset --soft $REMOTE/$BRANCH +git stash +git reset --hard HEAD^ +git stash apply --index + +git commit -m "$COMMIT_MSG" --no-verify