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:
Repository: accumulo
Updated Branches:
refs/heads/1.5 891584fb7 -> cc97c5123
refs/heads/1.6 289053085 -> ecd9f7b10
refs/heads/master 8fe826dd1 -> e2cb57823
ACCUMULO-3230 Include Hadoop's jersey libs on the classpath.
The timeline client requires jersey and yarn jobs will fail to
submit wit
Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc97c512
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc97c512
Diff: http://gi
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
ACCUMULO-3230 Include Hadoop's jersey libs on the classpath.
The timeline client requires jersey and yarn jobs will fail to
submit without them.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f816e788
Tree: http://git-
ACCUMULO-3230 Include Hadoop's jersey libs on the classpath.
The timeline client requires jersey and yarn jobs will fail to
submit without them.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f816e788
Tree: http://git-
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
