-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/55732/
-----------------------------------------------------------
(Updated Feb. 1, 2017, 6:45 p.m.)
Review request for mesos, Jason Lai, Joseph Wu, and Michael Park.
Changes
-------
Rebase and @haosdent's comment.
Bugs: MESOS-4119
https://issues.apache.org/jira/browse/MESOS-4119
Repository: mesos
Description
-------
This can help on some patches which includes conflicts that can be
resolved by 3 way merge.
Diffs (updated)
-----
support/apply-reviews.py cdfdd58f9310f95b075c025048b6523fc1a4da65
Diff: https://reviews.apache.org/r/55732/diff/
Testing
-------
With this fix, I was able to apply the chain in r/52534, which has a conflict
otherwise.
Bash log:
```
$ python ./support/apply-reviews.py -r 52534 -c --3way
2017-01-23 10:00:57 URL:https://reviews.apache.org/r/51027/diff/raw/
[9830/9830] -> "51027.patch" [1]
[3way 93791b1] Track allocation candidates to bound allocator.
Author: Jacob Janco <[email protected]>
2 files changed, 97 insertions(+), 54 deletions(-)
2017-01-23 10:00:59 URL:https://reviews.apache.org/r/52534/diff/raw/
[2950/2950] -> "52534.patch" [1]
error: patch failed: src/master/allocator/mesos/hierarchical.hpp:224
Falling back to three-way merge...
Applied patch to 'src/master/allocator/mesos/hierarchical.hpp' cleanly.
[3way 6f24fe7] Dispatch filter expiration twice.
Author: Jacob Janco <[email protected]>
2 files changed, 32 insertions(+), 8 deletions(-)
```
Thanks,
Zhitao Li
