Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d9336b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d9336b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d9336b8 Branch: refs/heads/master Commit: 3d9336b83fc5a90774968b5700d60e761905fb47 Parents: 0b7d8ee 92d19ee Author: Billie Rinaldi <bil...@apache.org> Authored: Tue Jun 2 19:11:49 2015 -0700 Committer: Billie Rinaldi <bil...@apache.org> Committed: Tue Jun 2 19:11:49 2015 -0700 ---------------------------------------------------------------------- .../harness/conf/StandaloneAccumuloClusterConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------