couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject couchdb commit: updated refs/heads/master to 1a91fe5
Date Thu, 31 Mar 2016 19:54:46 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 3ac6fe38b -> 1a91fe591


adding velocity-react license for Fauxton


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

Branch: refs/heads/master
Commit: 1a91fe591d7a5c607a5c00ff5e85747c18af6f0e
Parents: 3ac6fe3
Author: Ben Keen <ben.keen@gmail.com>
Authored: Tue Mar 15 11:53:39 2016 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Thu Mar 31 12:55:18 2016 -0700

----------------------------------------------------------------------
 LICENSE | 25 +++++++++++++++++++++++++
 NOTICE  |  4 ++++
 2 files changed, 29 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1a91fe59/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6ad7e26..f3b4673 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1432,3 +1432,28 @@ for src/fauxton/assets/js/libs/react-bootstrap.js
     LIABILITY, 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 velocity-react: NPM dependency for Fauxton
+https://github.com/twitter-fabric/velocity-react
+
+    The MIT License (MIT)
+
+    Copyright (c) 2015 Twitter and other contributors
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is furnished to do
+    so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, 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.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1a91fe59/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 978ee6e..1442158 100644
--- a/NOTICE
+++ b/NOTICE
@@ -197,3 +197,7 @@ This product also includes the following third-party components:
 * react-bootstrap.js
 
   Copyright (c) 2014 Stephen J. Collings, Matthew Honnibal, Pieter Vanderwerff
+
+* velocity-react
+
+  Copyright (c) 2015 Twitter, Inc.


Mime
View raw message