[
https://issues.apache.org/jira/browse/HELIX-320?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13837252#comment-13837252
]
Hudson commented on HELIX-320:
------------------------------
SUCCESS: Integrated in helix #1214 (See
[https://builds.apache.org/job/helix/1214/])
[HELIX-320] Remove merge conflicts from comments in files (kanak: rev
a39fa848c2534eb5cdde6a590b83766e9d22daaa)
* helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java
*
helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java
> Some files have unresolved conflicts in comments
> ------------------------------------------------
>
> Key: HELIX-320
> URL: https://issues.apache.org/jira/browse/HELIX-320
> Project: Apache Helix
> Issue Type: Bug
> Reporter: Kanak Biscuitwala
> Assignee: Kanak Biscuitwala
> Fix For: 0.7.1-incubating
>
>
--
This message was sent by Atlassian JIRA
(v6.1#6144)
