You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/09/13 00:47:13 UTC
[6/6] accumulo git commit: Merge branch '1.7'
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3b4e57ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3b4e57ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3b4e57ac
Branch: refs/heads/master
Commit: 3b4e57aca4dd8423aca4b9bfa9e64262935d105d
Parents: ca05baa 7c94ea0
Author: Josh Elser <el...@apache.org>
Authored: Sat Sep 12 18:48:05 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Sep 12 18:48:05 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 14 ++++
.../src/main/appended-resources/META-INF/NOTICE | 9 +++
.../main/appended-resources/META-INF/LICENSE | 74 ++++++++++++++++++++
.../main/appended-resources/META-INF/LICENSE | 74 --------------------
.../src/main/appended-resources/META-INF/NOTICE | 9 ---
5 files changed, 97 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3b4e57ac/assemble/pom.xml
----------------------------------------------------------------------