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/61e48e6b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61e48e6b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61e48e6b Branch: refs/heads/master Commit: 61e48e6b858b56b9232e3461848c599141716db2 Parents: 1ee5728 7a6fd95 Author: John Vines <jvi...@gmail.com> Authored: Mon Dec 16 13:00:24 2013 -0500 Committer: John Vines <jvi...@gmail.com> Committed: Mon Dec 16 13:00:24 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/Constants.java | 2 +- .../org/apache/accumulo/server/init/Initialize.java | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
