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/f6a67c20 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6a67c20 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6a67c20 Branch: refs/heads/master Commit: f6a67c20229bb24db07fe101da44be8856a7fee5 Parents: 370bb23 5ab2c15 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Apr 14 14:50:34 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Apr 14 14:50:34 2014 -0400 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/log4j.properties | 3 ++- conf/examples/1GB/standalone/log4j.properties | 3 ++- conf/examples/2GB/native-standalone/log4j.properties | 3 ++- conf/examples/2GB/standalone/log4j.properties | 3 ++- conf/examples/3GB/native-standalone/log4j.properties | 3 ++- conf/examples/3GB/standalone/log4j.properties | 3 ++- conf/examples/512MB/native-standalone/log4j.properties | 3 ++- conf/examples/512MB/standalone/log4j.properties | 3 ++- conf/templates/log4j.properties | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
