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/45d61cb3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/45d61cb3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/45d61cb3 Branch: refs/heads/master Commit: 45d61cb3cf282bfdfd66724684bd1c73c7444c1e Parents: 3f4e7b4 345332b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Aug 22 17:51:36 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Aug 22 17:51:36 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/45d61cb3/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java ----------------------------------------------------------------------