summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2017-11-30 19:32:16 -0500
committerAdam Kocoloski <adam@kocolosk.net>2017-12-01 08:34:11 -0500
commit57b615d762c645317fad299ef7a329ab03feb62f (patch)
treed8631eba6237e6d038e9e7e6917f9d73c7ff5906
parentc5e48a8429b3a76fdb63db80085875dea5e9b2b8 (diff)
downloadcouchdb-57b615d762c645317fad299ef7a329ab03feb62f.tar.gz
Remove references to etap
-rw-r--r--LICENSE26
-rw-r--r--NOTICE4
-rw-r--r--license.skip12
-rw-r--r--src/couch/src/couch_key_tree.erl4
4 files changed, 0 insertions, 46 deletions
diff --git a/LICENSE b/LICENSE
index 1f0b270b4..e9a9c81e8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -272,32 +272,6 @@ For the src/ibrowse component:
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-For the test/etap/etap.erl component:
-
- Copyright (c) 2008-2009 Nick Gerakines <nick@gerakines.net>
-
- 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.
-
-
For the src/couch_log/src/couch_log_trunc_io.erl and
the src/couch_log/src/couch_log_trunc_io_fmt.erl components
diff --git a/NOTICE b/NOTICE
index 5fddffb3e..a1f06ae7b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -22,10 +22,6 @@ This product also includes the following third-party components:
Copyright 2005-2012, Chandrashekhar Mullaparthi
- * ETap (http://github.com/ngerakines/etap/)
-
- Copyright 2009, Nick Gerakines <nick@gerakines.net>
-
* mimeparse.js (http://code.google.com/p/mimeparse/)
Copyright 2009, Chris Anderson <jchris@apache.org>
diff --git a/license.skip b/license.skip
index 143639251..35f91e13c 100644
--- a/license.skip
+++ b/license.skip
@@ -135,7 +135,6 @@
^src/couchjs-node/Makefile.in
^src/couch_dbupdates
^src/ejson/.*
-^src/etap/.*
^src/fauxton/app/addons/config/assets/less/config.less
^src/fauxton/assets/css/codemirror.css
^src/fauxton/assets/css/nv.d3.css
@@ -171,9 +170,7 @@
^src/ddoc_cache/README.md
^src/ets_lru/ebin/.*.beam
^src/ets_lru/ebin/ets_lru.app
-^src/ets_lru/test/etap.erl
^src/ejson/.*
-^src/etap/.*
^src/fabric/ebin/.*.beam
^src/fabric/ebin/fabric.app
^src/ibrowse/.*
@@ -190,15 +187,6 @@
^stamp-h1
^test/Makefile
^test/Makefile.in
-^test/etap/.*.beam
-^test/etap/.*.o
-^test/etap/etap.erl
-^test/etap/.deps/.*
-^test/etap/test_cfg_register
-^test/etap/Makefile
-^test/etap/Makefile.in
-^test/etap/temp..*
-^test/etap/fixtures/*
^test/javascript/Makefile
^test/javascript/Makefile.in
^test/local.ini
diff --git a/src/couch/src/couch_key_tree.erl b/src/couch/src/couch_key_tree.erl
index bc4076abc..e2e187eb1 100644
--- a/src/couch/src/couch_key_tree.erl
+++ b/src/couch/src/couch_key_tree.erl
@@ -498,7 +498,3 @@ value_pref(Other, ?REV_MISSING) ->
Other;
value_pref(Last, _) ->
Last.
-
-
-% Tests moved to test/etap/06?-*.t
-