Hi devs,

The issue with PR 2853 (package renaming) seems to be with incomplete
conflict resolution while merging heron/master into sreev/master.

Issue 1
The following files were deleted on heron/master. Need to be removed from
sreev/master
    deleted:
heron/healthmgr/src/java/org/apache/heron/healthmgr/common/ComponentMetricsHelper.java
    deleted:
heron/healthmgr/src/java/org/apache/heron/healthmgr/detectors/WaitQueueDisparityDetector.java
    deleted:
heron/healthmgr/tests/java/org/apache/heron/healthmgr/TestUtils.java
    deleted:
heron/healthmgr/tests/java/org/apache/heron/healthmgr/common/ComponentMetricsHelperTest.java
    deleted:
heron/healthmgr/tests/java/org/apache/heron/healthmgr/detectors/WaitQueueDisparityDetectorTest.java

Issue 2: Missed imports in
    modified:
 
heron/healthmgr/tests/java/org/apache/heron/healthmgr/detectors/BackPressureDetectorTest.java
    modified:
 
heron/healthmgr/tests/java/org/apache/heron/healthmgr/diagnosers/DataSkewDiagnoserTest.java
    modified:
 
heron/healthmgr/tests/java/org/apache/heron/healthmgr/diagnosers/SlowInstanceDiagnoserTest.java


https://github.com/ashvina/heron/commit/695a479f1fe704bd336a4ee59d9f6c29dbc127ce
should fix it.

I am working with Sree to update the PR soon.

Thanks,
Ashvin


On Mon, Apr 9, 2018 at 6:47 PM, SreeV <notificati...@github.com> wrote:

> @ashvina <https://github.com/ashvina>
> dhalion:
>
>    1. checkin metrics folder in microsoft/dhalion repo.
>    2. update the version tag from 0.2.1 to 0.2.2.
>    3. publish in maven repo.
>
> heron:
>
>    1. update version tag in file WORKSPACE.
>    2. test locally.
>    3. create another pull request and coordinate so it merged into master.
>
> I am blocked until then.
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <https://github.com/apache/incubator-heron/pull/2853#issuecomment-379947401>,
> or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AJkbjJoz72uR0shautHs-ZQB4mr_J3Wdks5tnA8ugaJpZM4TJk75>
> .
>

Reply via email to