sreev commented on a change in pull request #2866: create 'asf-site' and
redirect files
URL: https://github.com/apache/incubator-heron/pull/2866#discussion_r182322042
##########
File path:
heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManagerMetrics.java
##########
@@ -1,264 +0,0 @@
-// Copyright 2018 Twitter. All rights reserved.
Review comment:
it came in from merge conflict.
CONFLICT (rename/delete):
heron/healthmgr/src/java/com/twitter/heron/healthmgr/HealthManagerMetrics.java
deleted in f444372de2749c8a6953ff98a5178550ec026cd8 and renamed to
heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManagerMetrics.java
in HEAD. Version HEAD of
heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManagerMetrics.java
left in tree.
Deleted merge conflict for
'heron/healthmgr/src/java/org/apache/heron/healthmgr/HealthManagerMetrics.java':
{local}: created file
{remote}: deleted
Use (c)reated or (d)eleted file, or (a)bort? d
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
