You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/02 16:08:49 UTC
incubator-tinkerpop git commit: Update license/notice with gmetric4j
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 17ea564d2 -> 6a8fa2879
Update license/notice with gmetric4j
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/6a8fa287
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/6a8fa287
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/6a8fa287
Branch: refs/heads/master
Commit: 6a8fa2879a8bdd272dc23eeabbc5331fc56bb8b3
Parents: 17ea564
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 2 10:08:27 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 2 10:08:27 2015 -0400
----------------------------------------------------------------------
LICENSE.txt | 36 ++++++++++++++++++++++++++++++++++++
NOTICE.txt | 6 ++++++
2 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6a8fa287/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index a492854..9584963 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -541,6 +541,42 @@ The following components are provided under a BSD-style license. See project lin
-------------------------------------------------------------------
xmlenc Library (xmlenc:xmlenc - http://xmlenc.sourceforge.net)
+
+ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Title: gmetric4j
+
+ Copyright:
+
+ Copyright (C) 2012 Daniel Pocock <da...@pocock.com.au>
+ Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
+
+ Based on: jmxetric by Jasper Humphrey (BSD style license)
+
+ License: BSD terms
+
+ Copyright (C) 2010-2012 Daniel Pocock <da...@pocock.com.au>
+ Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ -------------------------------------------------------------------
+ gmetric4j (info.ganglia.gmetric4j:gmetric4j - http://github.com/ganglia/gmetric4j)
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
This license applies to all parts of Protocol Buffers except the following:
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6a8fa287/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index 26d8085..3c7d8ef 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -160,6 +160,12 @@ This product depends on:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
This product depends on:
+ gmetric4j (info.ganglia.gmetric4j:gmetric4j - http://github.com/ganglia/gmetric4j)
+
+ Copyright (C) 2012 Daniel Pocock <da...@pocock.com.au>
+ Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
+
+This product depends on:
HttpClient (commons-httpclient:commons-httpclient - http://jakarta.apache.org/httpcomponents/httpclient-3.x/)
Apache HttpComponents Client