Merge branch '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/3ce79a97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ce79a97 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ce79a97 Branch: refs/heads/master Commit: 3ce79a97308e1849b14471e3c1518ff88b9c00ce Parents: ff0693c 246104c2 Author: Josh Elser <els...@apache.org> Authored: Fri Mar 21 14:07:15 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Mar 21 14:07:15 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------