Merge branch '1.6' into 1.7
Conflicts:
shell/src/main/java/org/apache/accumulo/shell/commands/ActiveScanIterator.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/67d6d7c5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/67d6d7c5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/67d6d7c5
Branch: refs/heads/master
Commit: 67d6d7c56f859a33029e24da4aa025e52ecbd03b
Parents: 5ccb54e c3da293
Author: Josh Elser <els...@apache.org>
Authored: Mon Aug 24 14:35:58 2015 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Mon Aug 24 14:35:58 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
