Merge branch '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/47a1a72a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/47a1a72a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/47a1a72a Branch: refs/heads/master Commit: 47a1a72a744c7a8dd672504e43779c2c5acfb693 Parents: f8cdf19 494d694 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Feb 19 13:52:45 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Feb 19 13:52:45 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------