Merge branch '1.5.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80b4b076 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80b4b076 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80b4b076 Branch: refs/heads/master Commit: 80b4b076008caacaff951bfa17872d076cca2e2b Parents: 176df80 0895046 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Sep 11 15:59:40 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Sep 11 15:59:40 2013 -0400 ---------------------------------------------------------------------- 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, 16 insertions(+) ----------------------------------------------------------------------
