You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2016/02/27 18:53:16 UTC
[1/2] couch commit: updated refs/heads/master to f7348cb
Repository: couchdb-couch
Updated Branches:
refs/heads/master 30348e6aa -> f7348cbd9
Throw errors from open_ddoc instead of failing on badmatch error.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/4267b0eb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/4267b0eb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/4267b0eb
Branch: refs/heads/master
Commit: 4267b0eb19a0b36f67aeca5a841156ddd9df9c2e
Parents: 30348e6
Author: Nick Vatamaniuc <va...@gmail.com>
Authored: Fri Feb 26 18:07:51 2016 -0500
Committer: Nick Vatamaniuc <va...@gmail.com>
Committed: Fri Feb 26 18:07:51 2016 -0500
----------------------------------------------------------------------
src/couch_changes.erl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/4267b0eb/src/couch_changes.erl
----------------------------------------------------------------------
diff --git a/src/couch_changes.erl b/src/couch_changes.erl
index 7d5cf6e..29c2269 100644
--- a/src/couch_changes.erl
+++ b/src/couch_changes.erl
@@ -343,7 +343,10 @@ check_docids(_) ->
open_ddoc(#db{name=DbName, id_tree=undefined}, DDocId) ->
- {ok, _DDoc} = ddoc_cache:open_doc(mem3:dbname(DbName), DDocId);
+ case ddoc_cache:open_doc(mem3:dbname(DbName), DDocId) of
+ {ok, _} = Resp -> Resp;
+ Else -> throw(Else)
+ end;
open_ddoc(Db, DDocId) ->
case couch_db:open_doc(Db, DDocId, [ejson_body]) of
{ok, _} = Resp -> Resp;
[2/2] couch commit: updated refs/heads/master to f7348cb
Posted by kx...@apache.org.
Merge remote-tracking branch 'github/pr/146'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/f7348cbd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/f7348cbd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/f7348cbd
Branch: refs/heads/master
Commit: f7348cbd99e477e356cd1c637b4bfe6fb41c353c
Parents: 30348e6 4267b0e
Author: Alexander Shorin <kx...@apache.org>
Authored: Sat Feb 27 20:51:51 2016 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sat Feb 27 20:51:51 2016 +0300
----------------------------------------------------------------------
src/couch_changes.erl | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------