Merge remote-tracking branch 'local14/1.5.2-SNAPSHOT' into 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/4df3959b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4df3959b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4df3959b Branch: refs/heads/1.6.0-SNAPSHOT Commit: 4df3959b53a9b9fafac42c4a92df1a55aa25cce5 Parents: edbf231 eac9585 Author: Keith Turner <ktur...@apache.org> Authored: Mon Mar 24 13:10:08 2014 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Mon Mar 24 13:10:08 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------