Merge branch '1.5.1-SNAPSHOT' into 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/66c7848a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66c7848a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66c7848a Branch: refs/heads/1.6.0-SNAPSHOT Commit: 66c7848a1fa201bd6ce3576d09756aa0681f57d1 Parents: 4de0c1d 0d58654 Author: Josh Elser <[email protected]> Authored: Fri Dec 20 19:29:57 2013 -0500 Committer: Josh Elser <[email protected]> Committed: Fri Dec 20 19:29:57 2013 -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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/1GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/1GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/2GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/2GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/3GB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/3GB/standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/512MB/native-standalone/accumulo-env.sh ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/66c7848a/conf/examples/512MB/standalone/accumulo-env.sh ----------------------------------------------------------------------
