Repository: tez Updated Branches: refs/heads/master 7d7b38805 -> b78a84a0b
TEZ-3210. Tez UI 2: license should account for numeral, more-js, loader.js , etc (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b78a84a0 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b78a84a0 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b78a84a0 Branch: refs/heads/master Commit: b78a84a0bb6440a8b9edb515a4811bc34e02dc40 Parents: 7d7b388 Author: Sreenath Somarajapuram <[email protected]> Authored: Mon Apr 18 08:42:45 2016 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Mon Apr 18 08:42:45 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui2/src/main/resources/META-INF/LICENSE.txt | 13 ++++++++++--- tez-ui2/src/main/webapp/bower.json | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/b78a84a0/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 65b8bbd..3944df2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ ALL CHANGES: TEZ-3202. Reduce the memory need for jobs with high number of segments TEZ-3165. Allow Inputs/Outputs to be initialized serially, control processor initialization relative to Inputs/Outputs TEZ-3214. Tez UI 2: Pagination in All DAGs + TEZ-3210. Tez UI 2: license should account for numeral, more-js, loader.js , etc Release 0.8.3: 2016-04-14 http://git-wip-us.apache.org/repos/asf/tez/blob/b78a84a0/tez-ui2/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/resources/META-INF/LICENSE.txt b/tez-ui2/src/main/resources/META-INF/LICENSE.txt index d5523c1..b6c2900 100644 --- a/tez-ui2/src/main/resources/META-INF/LICENSE.txt +++ b/tez-ui2/src/main/resources/META-INF/LICENSE.txt @@ -218,16 +218,18 @@ The Apache TEZ tez-ui bundles the following files under the MIT License: - ember v2.2.0 (http://emberjs.com/) - Copyright (c) 2014 Yehuda Katz, Tom Dale and Ember.js contributors - ember-data v2.1.0 (https://github.com/emberjs/data) - Copyright (C) 2011-2014 Tilde, Inc. and contributors, Portions Copyright (C) 2011 LivingSocial Inc. - ember-resolver v2.0.3 (https://github.com/ember-cli/ember-resolver) - Copyright (c) 2013 Stefan Penner and Ember App Kit Contributors + - ember-load-initializers v0.1.7 (https://github.com/ember-cli/ember-load-initializers) - Copyright (c) 2014 ember-cli Contributors - bootstrap v3.3.6 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc - jquery v2.1.4 (http://jquery.org) - Copyright 2005, 2014 jQuery Foundation and other contributors - jquery-ui v1.11.4 (http://jqueryui.com/) - Copyright 2014 jQuery Foundation and other contributors - jquery-mousewheel v3.1.13 (https://github.com/jquery/jquery-mousewheel) - Copyright 2006, 2014 jQuery Foundation and other contributors, https://jquery.org/ - CodeMirror 5.11.0 (https://codemirror.net/) - Copyright (C) 2015 by Marijn Haverbeke <[email protected]> and others - FileSaver.js master branch #24b303f49213b905ec9062b708f7cd43d56a5dde (https://github.com/eligrey/FileSaver.js) - Authored by Eli Grey - - moment v2.11.1 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors + - moment v2.12.0 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors - moment-timezone v0.5.0 (http://momentjs.com/timezone/) - Copyright (c) 2014 Tim Wood - font-awesome css/less files v4.5.0 (http://fontawesome.io/) - Created by Dave Gandy - ember-bootstrap v0.5.1 (https://github.com/kaliber5/ember-bootstrap) - Copyright 2015 kaliber5 GmbH. + - more-js v0.8.2 (https://github.com/sreenaths/snippet-ss) - snippet-ss v1.11.0 (https://github.com/sreenaths/snippet-ss) - em-tgraph v0.0.3 (https://github.com/sreenaths/em-tgraph) - em-table v0.3.11 (https://github.com/sreenaths/em-table) @@ -238,7 +240,12 @@ The Apache TEZ tez-ui bundles the following files under the MIT License: - ember-cli-d3 v1.1.2 (https://github.com/ming-codes/ember-cli-d3) - Authored by Ming Liu - ember-cli-font-awesome v1.4.0 (https://github.com/martndemus/ember-cli-font-awesome) - Authored by Marten Schilstra <[email protected]> - ember-cli-jquery-ui 0.0.20 (https://github.com/gaurav0/ember-cli-jquery-ui) - Authored by Gaurav Munjal + - ember-wormhole v2.10.1 (https://github.com/yapplabs/ember-wormhole) - Copyright (c) 2015 - normalize.css v3.0.3 (github.com/necolas/normalize.css) - By Nicolas Gallagher & Jonathan Neal + - numeral v1.5.3 (https://github.com/adamwdraper/Numeral-js) - Copyright (c) 2012 Adam Draper + - loader.js v3.3.0 (https://github.com/ember-cli/loader.js) - Copyright (c) 2014 Yehuda Katz, Stefan Penner, and contributors + - ember-cli-shims v0.0.6 (https://github.com/ember-cli/ember-cli-shims) - Copyright (c) 2014 Stefan Penner and ember-cli Contributors + - ember-qunit v0.4.16 (https://github.com/rwjblue/ember-qunit) - Copyright (c) 2014 Ryan Florence All rights reserved. @@ -267,8 +274,8 @@ THE SOFTWARE. The Apache Tez tez-ui bundles the following files under BSD licenses: (3-clause BSD license) - - D3 v3.5.14 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock - - zip.js master branch #bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a (https://github.com/gildas-lormeau/zip.js) + - D3 v3.5.16 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock + - zip.js master branch #bfd76c66293305faaf9fcbb65b5ff7fe2dbe621a (https://github.com/gildas-lormeau/zip.js) - Copyright (c) 2013 Gildas Lormeau All rights reserved. http://git-wip-us.apache.org/repos/asf/tez/blob/b78a84a0/tez-ui2/src/main/webapp/bower.json ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/bower.json b/tez-ui2/src/main/webapp/bower.json index f6cf60c..4b0d01b 100644 --- a/tez-ui2/src/main/webapp/bower.json +++ b/tez-ui2/src/main/webapp/bower.json @@ -15,7 +15,7 @@ "font-awesome": "4.5.0", "jquery": "2.1.4", "jquery-ui": "1.11.4", - "moment": "2.11.1", + "moment": "2.12.0", "moment-timezone": "0.5.0", "numeral": "1.5.3", "snippet-ss": "1.11.0",
