Github user joshelser commented on the pull request:
https://github.com/apache/accumulo/pull/71#issuecomment-185994820
> I was able to merge this PR into 1.7 with no conflicts and then merge the
result of 1.7+PR into master with no conflicts. If that is not the case, let me
know and I'll fix it.
Thanks for being proactive about that, but it shouldn't be a big worry. We
can always address any merge conflicts from 1.7->master, it's not a
tricky/intertwined changeset to wrangle.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
