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/1bfa738a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1bfa738a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1bfa738a Branch: refs/heads/master Commit: 1bfa738a75e2d1634c15ed798365b0117fd920ae Parents: a88df14 c44fa4f Author: Josh Elser <els...@apache.org> Authored: Fri Jan 3 18:40:10 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Jan 3 18:40:10 2014 -0500 ---------------------------------------------------------------------- conf/examples/1GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/1GB/standalone/accumulo-site.xml | 2 +- conf/examples/2GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/2GB/standalone/accumulo-site.xml | 2 +- conf/examples/3GB/native-standalone/accumulo-site.xml | 2 +- conf/examples/3GB/standalone/accumulo-site.xml | 2 +- conf/examples/512MB/native-standalone/accumulo-site.xml | 2 +- conf/examples/512MB/standalone/accumulo-site.xml | 2 +- conf/examples/crypto/accumulo-site.xml | 2 +- conf/examples/vfs-classloader/accumulo-site.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
