hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/2] hbase git commit: HBASE-19224 Add "BSD 2-Clause license" to our accepted list
Date Thu, 09 Nov 2017 16:48:01 GMT
HBASE-19224 Add "BSD 2-Clause license" to our accepted list

Signed-off-by: Ted Yu <tedyu@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c04d17c4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c04d17c4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c04d17c4

Branch: refs/heads/master
Commit: c04d17c4a6be5c76b680bc368aa08da30f29f39e
Parents: ec59b00
Author: Josh Elser <elserj@apache.org>
Authored: Thu Nov 9 08:59:00 2017 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Nov 9 11:47:36 2017 -0500

----------------------------------------------------------------------
 hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c04d17c4/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index 0df8f33..05893a6 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1338,7 +1338,7 @@ You can redistribute it and/or modify it under either the terms of the
 ## license mentions.
 ##
 ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
-#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'BSD', 'Mozilla
Public License Version 1.1', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution
License, Version 2.5' ])
+#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'BSD', 'BSD
2-Clause license', 'Mozilla Public License Version 1.1', 'Mozilla Public License Version 2.0',
'Creative Commons Attribution License, Version 2.5' ])
 ## include LICENSE sections for anything not under ASL2.0
 #foreach( ${dep} in ${projects} )
 ## if there are no licenses we'll fail the build later, so


Mime
View raw message