-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
--------- **Commit 1:** [courier/segmentedRequest] mark the request "started" synchronously * Original sha: 8a49926 * Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T21:35:00Z **Commit 2:** [courier/fetch] detect aborted requests more agressively * Original sha: c12f18d * Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T21:35:46Z **Commit 3:** [courier/callClient] if there are no executable requests, do nothing * Original sha: 8fef03b * Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T21:36:18Z **Commit 4:** [courier/tests] updated test * Original sha: 985f997 * Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T22:25:31Z
- Loading branch information
1 parent
7a5a7ac
commit afc435c
Showing
4 changed files
with
87 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
### Backport of PR [#6651](https://github.com/elastic/kibana/pull/6651) to branch 4.5 failed | ||
|
||
|
||
**2** files could not be found in this branch, | ||
|
||
**1** patch failed to apply, | ||
while **1** patch was applied successfully. | ||
|
||
------------------------------------- | ||
|
||
The following script will rebase the commits that need to be backported onto | ||
this backport branch. Resolve any conflicts as you normally would in a rebase. | ||
You do *not* need to remove these backport.rej files, and you can add | ||
additional commits if that's necessary. | ||
|
||
``` | ||
sh begin-backport.rej | ||
``` | ||
|
||
Once the conficts are resolved on your local backport branch, the following | ||
script will 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. Finally, it'll replace the upstream | ||
backport branch (the one from the backport PR) with the result. | ||
|
||
``` | ||
sh finish-backport.rej | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/sh | ||
|
||
REMOTE="upstream" | ||
BRANCH="jasper/backport/6651/4.5" | ||
STARTING_SHA="8a4992640bf1e8f74316dbbad0d5875182b91bbf" | ||
ENDING_SHA="985f9970f3b73863b20d55369ac0e902e27384fd" | ||
|
||
WORKING_BRANCH="tmp/$BRANCH" | ||
|
||
git fetch $REMOTE | ||
|
||
git checkout -b $WORKING_BRANCH $ENDING_SHA | ||
git rebase $STARTING_SHA^ --onto $BRANCH |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Backport PR #6651 | ||
--------- | ||
|
||
**Commit 1:** | ||
[courier/segmentedRequest] mark the request "started" synchronously | ||
|
||
* Original sha: 8a4992640bf1e8f74316dbbad0d5875182b91bbf | ||
* Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T21:35:00Z | ||
|
||
**Commit 2:** | ||
[courier/fetch] detect aborted requests more agressively | ||
|
||
* Original sha: c12f18df2733f36819d482ad1c8b7152a5450584 | ||
* Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T21:35:46Z | ||
|
||
**Commit 3:** | ||
[courier/callClient] if there are no executable requests, do nothing | ||
|
||
* Original sha: 8fef03b816e016a1637a2557c1a1cb6e0cab7bc2 | ||
* Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T21:36:18Z | ||
|
||
**Commit 4:** | ||
[courier/tests] updated test | ||
|
||
* Original sha: 985f9970f3b73863b20d55369ac0e902e27384fd | ||
* Authored by spalger <spalger@users.noreply.github.com> on 2016-03-24T22:25:31Z |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/bin/sh | ||
|
||
REMOTE="upstream" | ||
BRANCH="jasper/backport/6651/4.5" | ||
|
||
COMMIT_MSG=`cat commit-message-backport.rej` | ||
|
||
WORKING_BRANCH="tmp/$BRANCH" | ||
|
||
git checkout $BRANCH | ||
git reset --hard $WORKING_BRANCH | ||
git branch -D $WORKING_BRANCH | ||
|
||
git reset --soft $REMOTE/$BRANCH | ||
git stash | ||
git reset --hard HEAD^ | ||
git stash apply --index | ||
|
||
git commit -m "$COMMIT_MSG" | ||
git push -f $REMOTE $BRANCH |