You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/08/27 08:42:01 UTC
couchdb commit: updated refs/heads/master to 73a0307
Repository: couchdb
Updated Branches:
refs/heads/master dd102920e -> 73a03074d
Add velocity.js to licence and notice
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/73a03074
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/73a03074
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/73a03074
Branch: refs/heads/master
Commit: 73a03074d9397151e8151d658b20f871c13d39f7
Parents: dd10292
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Aug 27 08:41:48 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Aug 27 08:41:48 2014 +0200
----------------------------------------------------------------------
LICENSE | 24 ++++++++++++++++++++++++
NOTICE | 4 ++++
2 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73a03074/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f3242db..4f31ab6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1352,3 +1352,27 @@ Apache License
See the License for the specific language governing permissions and
limitations under the License.
+for velocity.js
+
+ The MIT License (MIT)
+
+ Copyright (c) 2014 Julian Shapiro
+
+ 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/73a03074/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 08e3b82..41c1807 100644
--- a/NOTICE
+++ b/NOTICE
@@ -189,3 +189,7 @@ This product also includes the following third-party components:
* src/fauxton/asserts/js/plugins/cloudant.pagingcollection.js
Copyright (c) 2014, Cloudant http://cloudant.com
+
+ * velocity.js (https://github.com/julianshapiro/velocity)
+
+ Copyright (c) 2014 Julian Shapiro