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/d95d9ead Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d95d9ead Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d95d9ead Branch: refs/heads/master Commit: d95d9eadf47dcff9decf8c2836aeb7253cd719ef Parents: b21d7e7 9ae34e0 Author: Josh Elser <[email protected]> Authored: Sun Dec 8 21:52:15 2013 -0500 Committer: Josh Elser <[email protected]> Committed: Sun Dec 8 21:52:15 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 3 +++ bin/start-server.sh | 10 ++++++++-- conf/examples/1GB/native-standalone/accumulo-env.sh | 3 +++ conf/examples/1GB/standalone/accumulo-env.sh | 3 +++ conf/examples/2GB/native-standalone/accumulo-env.sh | 3 +++ conf/examples/2GB/standalone/accumulo-env.sh | 3 +++ conf/examples/3GB/native-standalone/accumulo-env.sh | 3 +++ conf/examples/3GB/standalone/accumulo-env.sh | 3 +++ conf/examples/512MB/native-standalone/accumulo-env.sh | 3 +++ conf/examples/512MB/standalone/accumulo-env.sh | 3 +++ 10 files changed, 35 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
