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/3132b012 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3132b012 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3132b012 Branch: refs/heads/master Commit: 3132b0121f7cab6882c19b0f94a41dac154c1c95 Parents: 0524ddb f67603f Author: Josh Elser <els...@apache.org> Authored: Mon Jan 27 15:02:09 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Jan 27 15:02:09 2014 -0500 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/1GB/standalone/accumulo-env.sh | 2 +- conf/examples/2GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/2GB/standalone/accumulo-env.sh | 2 +- conf/examples/3GB/native-standalone/accumulo-env.sh | 2 +- conf/examples/3GB/standalone/accumulo-env.sh | 2 +- conf/examples/512MB/native-standalone/accumulo-env.sh | 2 +- conf/examples/512MB/standalone/accumulo-env.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
