Repository: incubator-htrace Updated Branches: refs/heads/master 215c96826 -> 7d6488b4a
HTRACE-267. Move owl logo licensing information from NOTICE to LICENSE (cmccabe) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/7d6488b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/7d6488b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/7d6488b4 Branch: refs/heads/master Commit: 7d6488b4a1361820a88cece7112879d223980f8a Parents: 215c968 Author: Colin P. Mccabe <[email protected]> Authored: Wed Oct 21 11:54:55 2015 -0700 Committer: Colin P. Mccabe <[email protected]> Committed: Wed Oct 21 11:54:55 2015 -0700 ---------------------------------------------------------------------- LICENSE.txt | 3 +++ NOTICE.txt | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/7d6488b4/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 3b4e510..0befae8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -203,6 +203,9 @@ of dependencies that are NOT Apache Licensed. See the License for the specific language governing permissions and limitations under the License. +The HTrace Owl logo is from http://www.clker.com/clipart-13653.html. It is +public domain. + D3, a javascript library for manipulating data, used by htrace-hbase is Copyright 2010-2014, Michael Bostock and BSD licensed: https://github.com/mbostock/d3/blob/master/LICENSE http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/7d6488b4/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index 9a04bad..845b696 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -11,6 +11,3 @@ that are NOT Apache licensed (with pointers to their licensing) Apache HTrace includes an Apache Thrift connector to Zipkin. Zipkin is a distributed tracing system that is Apache 2.0 Licensed. Copyright 2012 Twitter, Inc. - -Our Owl logo we took from http://www.clker.com/clipart-13653.html. -It is public domain/free.
