Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eae953e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eae953e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eae953e6 Branch: refs/heads/master Commit: eae953e6afd36885f502d368b946a35d380cb14d Parents: f277fea 448e757 Author: Sean Busbey <bus...@cloudera.com> Authored: Fri Apr 25 18:11:43 2014 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Fri Apr 25 18:11:43 2014 -0500 ---------------------------------------------------------------------- CHANGES | 73 ++++++++++++++++++++---------------------------------------- 1 file changed, 24 insertions(+), 49 deletions(-) ----------------------------------------------------------------------