[5/7] git commit: Merge branch '1.5' into 1.6

2014-10-12 Thread elserj
Merge branch '1.5' into 1.6 Conflicts: assemble/conf/examples/vfs-classloader/accumulo-site.xml assemble/conf/templates/accumulo-site.xml conf/examples/1GB/native-standalone/accumulo-site.xml conf/examples/2GB/native-standalone/accumulo-site.xml conf/example

[5/7] git commit: Merge branch '1.5' into 1.6

2014-10-10 Thread ctubbsii
Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/28905308 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/28905308 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/28905308