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/af224c2e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af224c2e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af224c2e Branch: refs/heads/1.6.1-SNAPSHOT Commit: af224c2e48e5e51bcb66951056120c7dbb89ca8f Parents: c9d884f 641d42c Author: Josh Elser <els...@apache.org> Authored: Thu Jul 24 22:41:01 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jul 24 22:41:01 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------