Merge branch '1.7' into 1.8

-sours merge, since 1.7 and 1.8 have different classpath needs for ACCUMULO-4467


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7ab49808
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7ab49808
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7ab49808

Branch: refs/heads/1.8
Commit: 7ab498087b5cf6ed032e8d9d72f31830198ee37a
Parents: 080a3ba 985651b
Author: Sean Busbey <bus...@cloudera.com>
Authored: Thu Sep 22 12:59:14 2016 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Thu Sep 22 12:59:20 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------


Reply via email to