Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT -sours
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e86bfc29 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e86bfc29 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e86bfc29 Branch: refs/heads/1.6.1-SNAPSHOT Commit: e86bfc29384cc33f472cfe4f020ba4031da24608 Parents: 01e1181 c16f105 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri May 16 12:57:34 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri May 16 12:57:34 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------