Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9EFBD200D2E for ; Tue, 31 Oct 2017 11:06:57 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9C04F1609EC; Tue, 31 Oct 2017 10:06:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E24A71609EB for ; Tue, 31 Oct 2017 11:06:56 +0100 (CET) Received: (qmail 92724 invoked by uid 500); 31 Oct 2017 10:06:55 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 92715 invoked by uid 99); 31 Oct 2017 10:06:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Oct 2017 10:06:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BA539DFB6F; Tue, 31 Oct 2017 10:06:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sunilg@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-7398. Update LICENSE.txt with respect to new YARN UI merge. Contributed by Varun Saxena. Date: Tue, 31 Oct 2017 10:06:55 +0000 (UTC) archived-at: Tue, 31 Oct 2017 10:06:57 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 76ec5eab1 -> 6dd1db68f YARN-7398. Update LICENSE.txt with respect to new YARN UI merge. Contributed by Varun Saxena. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6dd1db68 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6dd1db68 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6dd1db68 Branch: refs/heads/branch-2 Commit: 6dd1db68ff4bde32b33f3529f71fd7c78eea4911 Parents: 76ec5ea Author: Sunil G Authored: Tue Oct 31 15:36:41 2017 +0530 Committer: Sunil G Committed: Tue Oct 31 15:36:41 2017 +0530 ---------------------------------------------------------------------- LICENSE.txt | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6dd1db68/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index 09a25d8..25c3b30 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -577,13 +577,60 @@ 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. -For: +The binary distribution of this product bundles these dependencies under the +following license: hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.0.2 hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css -And the binary distribution of this product bundles these dependencies under the -following license: +bootstrap v3.3.6 +broccoli-asset-rev v2.4.2 +broccoli-funnel v1.0.1 +broccoli-merge-trees v1.1.1 +datatables v1.10.8 +em-helpers v0.5.13 +em-table v0.1.6 +ember v2.2.0 +ember-array-contains-helper v1.0.2 +ember-bootstrap v0.5.1 +ember-cli v1.13.13 +ember-cli-app-version v1.0.0 +ember-cli-babel v5.1.6 +ember-cli-content-security-policy v0.4.0 +ember-cli-dependency-checker v1.2.0 +ember-cli-htmlbars v1.0.2 +ember-cli-htmlbars-inline-precompile v0.3.1 +ember-cli-ic-ajax v0.2.1 +ember-cli-inject-live-reload v1.4.0 +ember-cli-jquery-ui v0.0.20 +ember-cli-moment-shim v0.7.3 +ember-cli-numeral v0.2.0 +ember-cli-qunit v1.2.1 +ember-cli-release v0.2.8 +ember-cli-shims v0.0.6 +ember-cli-sri v1.2.1 +ember-cli-test-loader v0.2.1 +ember-cli-uglify v1.2.0 +ember-d3 v0.1.0 +ember-data v2.1.0 +ember-disable-proxy-controllers v1.0.1 +ember-export-application-global v1.0.5 +ember-lodash v0.0.10 +ember-load-initializers v0.1.7 +ember-qunit v0.4.16 +ember-qunit-notifications v0.1.0 +ember-resolver v2.0.3 +ember-spin-spinner v0.2.3 +ember-truth-helpers v1.2.0 +jquery v2.1.4 +jquery-ui v1.11.4 +loader.js v3.3.0 +momentjs v2.10.6 +qunit v1.19.0 +select2 v4.0.0 +snippet-ss v1.11.0 +spin.js v2.3.2 +testem v0.9.11 Mockito 1.8.5 JUL to SLF4J bridge 1.7.25 SLF4J API Module 1.7.25 @@ -686,7 +733,8 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. For: -hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js +hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js and +D3 v3.5.6 in hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui -------------------------------------------------------------------------------- D3 is available under a 3-clause BSD license. For details, see: --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org