[couchdb] branch master updated: Add recon for user convenience (#2511)

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/master by this push:
     new b9d138b  Add recon for user convenience (#2511)
b9d138b is described below

commit b9d138b0a058fabd5943511e9951e2fbe50a4fd2
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Sat Feb 1 05:00:18 2020 +0000

    Add recon for user convenience (#2511)
---
 .gitignore          |  1 +
 LICENSE             | 31 +++++++++++++++++++++++++++++++
 NOTICE              |  4 ++++
 rebar.config.script |  3 ++-
 rel/reltool.config  |  9 +++++++--
 5 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e2f3df0..78eccc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@ src/oauth/
 src/parse_trans/
 src/proper/
 src/rebar/
+src/recon/
 src/smoosh/
 src/snappy/
 src/ssl_verify_fun/
diff --git a/LICENSE b/LICENSE
index 8278d4a..048ee41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2236,3 +2236,34 @@ 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/recon component:
+
+Copyright (c) 2012-2017, Frédéric Trottier-Hébert
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+  The names of its contributors may not be used to endorse or promote
+  products derived from this software without specific prior written
+  permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/NOTICE b/NOTICE
index e867466..e37a990 100644
--- a/NOTICE
+++ b/NOTICE
@@ -189,3 +189,7 @@ This product also includes the following third-party components:
 * hyper
 
   Copyright (c) 2014 Game Analytics ApS
+
+* recon
+
+  Copyright (c) 2012-2017, Frédéric Trottier-Hébert
diff --git a/rebar.config.script b/rebar.config.script
index ace09ae..0708606 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -159,7 +159,8 @@ DepDescs = [
 {ibrowse,          "ibrowse",          {tag, "CouchDB-4.0.1-1"}},
 {jiffy,            "jiffy",            {tag, "CouchDB-1.0.1-1"}},
 {mochiweb,         "mochiweb",         {tag, "v2.20.0"}},
-{meck,             "meck",             {tag, "0.8.8"}}
+{meck,             "meck",             {tag, "0.8.8"}},
+{recon,            "recon",            {tag, "2.5.0"}}
 ],
 
 WithProper = lists:keyfind(with_proper, 1, CouchConfig) == {with_proper, true},
diff --git a/rel/reltool.config b/rel/reltool.config
index 1be2ccc..5285504 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -59,7 +59,9 @@
         rexi,
         setup,
         smoosh,
-        snappy
+        snappy,
+        %% extra
+        recon
     ]},
     {rel, "start_clean", "", [kernel, stdlib]},
     {boot_rel, "couchdb"},
@@ -116,7 +118,10 @@
     {app, rexi, [{incl_cond, include}]},
     {app, setup, [{incl_cond, include}]},
     {app, smoosh, [{incl_cond, include}]},
-    {app, snappy, [{incl_cond, include}]}
+    {app, snappy, [{incl_cond, include}]},
+
+    %% extra
+    {app, recon, [{incl_cond, include}]}
 ]}.
 
 {overlay_vars, "couchdb.config"}.