You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2013/04/25 15:20:47 UTC
[1/2] git commit: updated refs/heads/master to a0fc1c6
Updated Branches:
refs/heads/master d751a3914 -> a0fc1c608
Ensure fauxton files are licensed to pass make distcheck
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ac620782
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ac620782
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ac620782
Branch: refs/heads/master
Commit: ac620782bc5096f41f91009e612558f3d9a80b15
Parents: d751a39
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Thu Apr 25 12:55:18 2013 +0200
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Thu Apr 25 14:51:49 2013 +0200
----------------------------------------------------------------------
license.skip | 2 +-
src/fauxton/app/templates/fauxton/footer.html | 16 +++++++++++++++-
src/fauxton/app/templates/fauxton/pagination.html | 14 ++++++++++++++
3 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ac620782/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 291e51d..f1df589 100644
--- a/license.skip
+++ b/license.skip
@@ -113,7 +113,7 @@
^src/fauxton/TODO.md
^src/fauxton/settings.json.*
^src/fauxton/test/.*
-^src/fauxton/tasks/rename.json
+^src/fauxton/tasks/addon/rename.json
^src/ibrowse/.*
^src/mochiweb/.*
^src/snappy/.*
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ac620782/src/fauxton/app/templates/fauxton/footer.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/footer.html b/src/fauxton/app/templates/fauxton/footer.html
index 6af1bcf..a070b52 100644
--- a/src/fauxton/app/templates/fauxton/footer.html
+++ b/src/fauxton/app/templates/fauxton/footer.html
@@ -1 +1,15 @@
-<p>Fauxton <%=version%> on <a href="http://couchdb.apache.org/">Apache CouchDB</a></p>
\ No newline at end of file
+<!--
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
+<p>Fauxton <%=version%> on <a href="http://couchdb.apache.org/">Apache CouchDB</a></p>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/ac620782/src/fauxton/app/templates/fauxton/pagination.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/pagination.html b/src/fauxton/app/templates/fauxton/pagination.html
index 161593b..6ed56a8 100644
--- a/src/fauxton/app/templates/fauxton/pagination.html
+++ b/src/fauxton/app/templates/fauxton/pagination.html
@@ -1,3 +1,17 @@
+<!--
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this file except in compliance with the License. You may obtain a copy of
+the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations under
+the License.
+-->
+
<div class="pagination pagination-centered">
<ul>
<% if (page > 1) { %>
[2/2] git commit: updated refs/heads/master to a0fc1c6
Posted by dc...@apache.org.
Include R15B03 and R16B in travis-ci build matrix
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a0fc1c60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a0fc1c60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a0fc1c60
Branch: refs/heads/master
Commit: a0fc1c608d9f05b68cd05ebb35b842c9ad5c82cc
Parents: ac62078
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Thu Apr 25 15:20:02 2013 +0200
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Thu Apr 25 15:20:16 2013 +0200
----------------------------------------------------------------------
.travis.yml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a0fc1c60/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index ba6eee8..70d4d17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@ before_script: ./bootstrap && ./configure
script: make distcheck
language: erlang
otp_release:
+ - R16B
+ - R15B03
- R15B02
- R15B01
- R15B