[
https://issues.apache.org/jira/browse/ACCUMULO-1974?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13849595#comment-13849595
]
Bill Havanki commented on ACCUMULO-1974:
----------------------------------------
I should note that, for me, Git fell back to a 3-way merge when I rebased. The
merged Property.java file looks OK to me.
> Javadoc: core/conf
> ------------------
>
> Key: ACCUMULO-1974
> URL: https://issues.apache.org/jira/browse/ACCUMULO-1974
> Project: Accumulo
> Issue Type: Improvement
> Components: docs
> Reporter: Bill Havanki
> Assignee: Bill Havanki
> Priority: Trivial
> Labels: documentation, javadoc
> Fix For: 1.7.0
>
> Attachments: ACCUMULO-1974.master.patch
>
>
> Author javadoc for org.apache.accumulo.core.conf classes.
--
This message was sent by Atlassian JIRA
(v6.1.4#6159)
