You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/02/01 02:31:36 UTC
[couchdb] branch add-recon updated (670d45f -> 066f5c8)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch add-recon
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
discard 670d45f Add recon for user convenience
new 066f5c8 Add recon for user convenience
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (670d45f)
\
N -- N -- N refs/heads/add-recon (066f5c8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE | 31 +++++++++++++++++++++++++++++++
NOTICE | 4 ++++
2 files changed, 35 insertions(+)
[couchdb] 01/01: Add recon for user convenience
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch add-recon
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 066f5c8b416b5b0fba2b02d602487fbd4deb1649
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Fri Jan 31 21:26:23 2020 -0500
Add recon for user convenience
---
.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"}.