You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@activemq.apache.org by andytaylor <gi...@git.apache.org> on 2018/09/05 08:01:55 UTC
[GitHub] activemq-artemis pull request #2293: ARTEMIS-2075 - allow Extra backups to t...
GitHub user andytaylor opened a pull request:
https://github.com/apache/activemq-artemis/pull/2293
ARTEMIS-2075 - allow Extra backups to try to replicate more than once
https://issues.apache.org/jira/browse/ARTEMIS-2075
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/andytaylor/activemq-artemis ARTEMIS-2075
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/activemq-artemis/pull/2293.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2293
----
commit 967fdb1471d8d836dfdbce0cfdd11016e9bec9c5
Author: andytaylor <an...@...>
Date: 2018-09-05T07:41:06Z
ARTEMIS-2075 - allow Extra backups to try to replicate more than once
https://issues.apache.org/jira/browse/ARTEMIS-2075
----
---
[GitHub] activemq-artemis issue #2293: ARTEMIS-2075 - allow Extra backups to try to r...
Posted by andytaylor <gi...@git.apache.org>.
Github user andytaylor commented on the issue:
https://github.com/apache/activemq-artemis/pull/2293
please retest this
---
[GitHub] activemq-artemis pull request #2293: ARTEMIS-2075 - allow Extra backups to t...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/activemq-artemis/pull/2293
---
[GitHub] activemq-artemis issue #2293: ARTEMIS-2075 - allow Extra backups to try to r...
Posted by andytaylor <gi...@git.apache.org>.
Github user andytaylor commented on the issue:
https://github.com/apache/activemq-artemis/pull/2293
this will need cherry picking into 2.6.x as well
---
[GitHub] activemq-artemis issue #2293: ARTEMIS-2075 - allow Extra backups to try to r...
Posted by clebertsuconic <gi...@git.apache.org>.
Github user clebertsuconic commented on the issue:
https://github.com/apache/activemq-artemis/pull/2293
@andytaylor I have added a few questions to the JIRA, as the question is about the JIRA and not the PR itself.
---
[GitHub] activemq-artemis issue #2293: ARTEMIS-2075 - allow Extra backups to try to r...
Posted by andytaylor <gi...@git.apache.org>.
Github user andytaylor commented on the issue:
https://github.com/apache/activemq-artemis/pull/2293
retest this please
---
[GitHub] activemq-artemis issue #2293: ARTEMIS-2075 - allow Extra backups to try to r...
Posted by clebertsuconic <gi...@git.apache.org>.
Github user clebertsuconic commented on the issue:
https://github.com/apache/activemq-artemis/pull/2293
@andytaylor Cherry-pick on this doesn't work. Quite a few conflicts.
You have two options:
I - you do the cherry-pick yourself:
```
git checkout 2.6.x
git cherry-pick -x 3b34127bb3ce6720ff794551a2877ba9794f0960
```
resolve the conflits yourself:
```
git push apache 2.6.x
```
or II:
Do the cherry-pick like I, and send a pull request into 2.6.x. at that point it would be a simple merge.
I would prefer I, as Pull Requests don't automatically close unless it's a simple merge (no rebase involved).
---