Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e2cb5782 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e2cb5782 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e2cb5782 Branch: refs/heads/master Commit: e2cb57823b5f43901ffa0c2da964145eb8c2c184 Parents: 8fe826d ecd9f7b Author: Josh Elser <els...@apache.org> Authored: Sun Oct 12 12:55:34 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun Oct 12 12:55:34 2014 -0400 ---------------------------------------------------------------------- assemble/conf/examples/vfs-classloader/accumulo-site.xml | 2 ++ assemble/conf/templates/accumulo-site.xml | 2 ++ 2 files changed, 4 insertions(+) ----------------------------------------------------------------------
