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/3be435e9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3be435e9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3be435e9 Branch: refs/heads/master Commit: 3be435e9fc7a20a65233f25cc1c52fdda586e8b4 Parents: ad676c1 152f194 Author: Josh Elser <els...@apache.org> Authored: Wed Dec 18 21:54:34 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Dec 18 21:54:34 2013 -0500 ---------------------------------------------------------------------- bin/accumulo | 2 +- .../1GB/native-standalone/accumulo-site.xml | 5 + conf/examples/1GB/standalone/accumulo-site.xml | 5 + .../2GB/native-standalone/accumulo-site.xml | 5 + conf/examples/2GB/standalone/accumulo-site.xml | 123 ++++++++++--------- .../3GB/native-standalone/accumulo-site.xml | 5 + conf/examples/3GB/standalone/accumulo-site.xml | 5 + .../512MB/native-standalone/accumulo-site.xml | 5 + .../examples/512MB/standalone/accumulo-site.xml | 5 + conf/examples/crypto/accumulo-site.xml | 5 + conf/examples/vfs-classloader/accumulo-site.xml | 5 + .../accumulo/core/security/SecurityUtil.java | 1 + 12 files changed, 111 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
