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/aac0b66f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aac0b66f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aac0b66f Branch: refs/heads/master Commit: aac0b66ffbd32b3a3b3979c8dd899eb3cf9367d5 Parents: 4d7c1cc 743d64b Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Nov 13 13:16:31 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Nov 13 13:16:31 2013 -0500 ---------------------------------------------------------------------- server/base/src/main/java/org/apache/accumulo/server/Accumulo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
