You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/10/26 05:31:33 UTC
incubator-zeppelin git commit: ZEPPELIN-360 Remove "Copyright 2014,
NFLabs inc." from LICENSE
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 28a42ff68 -> 11233168f
ZEPPELIN-360 Remove "Copyright 2014, NFLabs inc." from LICENSE
This PR addresses https://issues.apache.org/jira/browse/ZEPPELIN-360
Removing "Copyright 2014, NFLabs inc." from LICENSE.
Author: Lee moon soo <mo...@apache.org>
Closes #364 from Leemoonsoo/ZEPPELIN-360 and squashes the following commits:
cfb814b [Lee moon soo] Remove "Copyright (c) 2010-2015 NFLabs Inc." from NOTICE
fb75e86 [Lee moon soo] ZEPPELIN-360 Remove "Copyright 2014, NFLabs inc." from LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/11233168
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/11233168
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/11233168
Branch: refs/heads/master
Commit: 11233168fc08322baf8e1032153f370ed272431c
Parents: 28a42ff
Author: Lee moon soo <mo...@apache.org>
Authored: Sun Oct 25 14:59:17 2015 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Mon Oct 26 05:31:28 2015 +0100
----------------------------------------------------------------------
LICENSE | 2 +-
NOTICE | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/11233168/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 0fb8237..9b2413c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright 2014, NFLabs inc.
+ Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/11233168/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index c455bcb..2428e14 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,7 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).
Portions of this software were developed at NFLabs, Inc. (http://www.nflabs.com)
-Copyright (c) 2010-2015 NFLabs Inc.