Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f573a14d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f573a14d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f573a14d Branch: refs/heads/master Commit: f573a14dbe7e7ebdac6638cb13e0c0940fd925ed Parents: 045f7b2 f8861bf Author: Keith Turner <ktur...@apache.org> Authored: Thu Jun 26 11:33:57 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Thu Jun 26 11:33:57 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------