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/0cdd5fd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0cdd5fd0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0cdd5fd0 Branch: refs/heads/1.6.1-SNAPSHOT Commit: 0cdd5fd08043150b2e3291f13d4b42ece1abbc6e Parents: d54de55 b2ecd1c Author: Josh Elser <els...@apache.org> Authored: Thu May 15 17:02:51 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu May 15 17:02:51 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/util/LocalityGroupUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0cdd5fd0/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java ----------------------------------------------------------------------