Repository: incubator-atlas Updated Branches: refs/heads/master 727b27fbd -> c438e5114
ATLAS-964 Cleanup NOTICE and LICENSE (shwethags) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/c438e511 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/c438e511 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/c438e511 Branch: refs/heads/master Commit: c438e51149924c4ec88eac67140ae430994841d2 Parents: 727b27f Author: Shwetha GS <[email protected]> Authored: Thu Jun 30 11:48:59 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Thu Jun 30 11:48:59 2016 +0530 ---------------------------------------------------------------------- LICENSE | 18 +++++++++--------- NOTICE | 29 +---------------------------- release-log.txt | 1 + 3 files changed, 11 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c438e511/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 2fc9719..032284e 100755 --- a/LICENSE +++ b/LICENSE @@ -210,26 +210,26 @@ subcomponents is subject to the terms and conditions of the following licenses. This product bundles titan 0.5.4, which is available under -"Apache License". For details, see 3party-licenses/titan-LICENSE +Apache License. For details, see 3party-licenses/titan-LICENSE This product bundles mock(for python tests) 1.0.1, which is available under -"BSD License". For details, see 3party-licenses/mock-LICENSE +BSD License. For details, see 3party-licenses/mock-LICENSE This product bundles animate, which is available under -"MIT License". For details, see 3party-licenses/animate-LICENSE +MIT License. For details, see 3party-licenses/animate-LICENSE This product bundles Handlebars.js, which is available under -"MIT License". For details, see 3party-licenses/handlebars-LICENSE +MIT License. For details, see 3party-licenses/handlebars-LICENSE This product bundles bootstrap-sidebar 0.4.0, which is available under -"MIT License". For details, see 3party-licenses/bootstrap-sidebar-LICENSE +MIT License. For details, see 3party-licenses/bootstrap-sidebar-LICENSE This product bundles hbs 0.4.0, which is available under -"MIT License". For details, see 3party-licenses/hbs-LICENSE +MIT License. For details, see 3party-licenses/hbs-LICENSE This product bundles require-handlebars-plugin 0.4.0, which is available under -"WTFPL License". For details, see 3party-licenses/require-handlebars-plugin-LICENSE +WTFPL License. For details, see 3party-licenses/require-handlebars-plugin-LICENSE -This product bundles json2.js, which is available under -"Public Domain license". By Douglas Crockford. +This product bundles json2.js (https://github.com/douglascrockford/JSON-js - +Public Domain license) by Douglas Crockford ======================================================================= \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c438e511/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 4eedca1..93ace43 100755 --- a/NOTICE +++ b/NOTICE @@ -19,31 +19,4 @@ Titan includes software developed by Aurelius (http://thinkaurelius.com/) and th * Dan LaRocque * Marko A. Rodriguez * Stephen Mallette - * Pavel Yaskevich - -Titan also includes software from other open source projects including, but not limited to (check pom.xml for complete listing): - - * TinkerPop Blueprints [http://blueprints.tinkerpop.com] - * TinkerPop Gremlin [http://gremlin.tinkerpop.com] - * TinkerPop Rexster [http://rexster.tinkerpop.com] - * TinkerPop Frames [http://frames.tinkerpop.com] - * Apache Commons [http://commons.apache.org/] - * Google Guava [http://code.google.com/p/guava-libraries/] - * HPPC [http://labs.carrotsearch.com/hppc.html] - * Junit Benchmark [http://labs.carrotsearch.com/junit-benchmarks.html] - * Kryo [http://code.google.com/p/kryo/] - * SLF4J [http://www.slf4j.org/] - * Metrics [http://metrics.codahale.com/] - * Apache log4j [http://logging.apache.org/log4j/] - * Apache HBase [http://hbase.apache.org/] - * Apache Hadoop [http://hadoop.apache.org/] - * Apache Cassandra [http://cassandra.apache.org/] - * Apache Lucene [http://lucene.apache.org/] - * Apache MRUnit [http://mrunit.apache.org/] - * Codehaus Groovy [http://groovy.codehaus.org/] - * OpenRDF [http://www.openrdf.org/] - * Elastic Search [http://www.elasticsearch.org/] - * Astyanax [https://github.com/Netflix/astyanax] - * JUnit [http://www.junit.org/] - * Mockito [http://code.google.com/p/mockito/] - * Oracle's BerkeleyDB [http://www.oracle.com/technetwork/products/berkeleydb/] (see license below) + * Pavel Yaskevich \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/c438e511/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 6864ab2..5fb5dbe 100644 --- a/release-log.txt +++ b/release-log.txt @@ -35,6 +35,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-964 Cleanup NOTICE and LICENSE (shwethags) ATLAS-962 Include Apache Incubator disclaimer text on website (yhemanth via shwethags) ATLAS-958 Add licenses for dashboard dependencies (kevalbhatt18 via shwethags) ATLAS-474 Server does not start if the type is updated with same super type class information (dkantor via shwethags)
