You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/07/02 23:59:42 UTC
couch commit: updated refs/heads/master to f29e590
Repository: couchdb-couch
Updated Branches:
refs/heads/master 331f8110b -> f29e590c0
erlang R14-18 compatibility
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/f29e590c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/f29e590c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/f29e590c
Branch: refs/heads/master
Commit: f29e590c09d600631a0f1ce53b52247388048fdb
Parents: 331f811
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 2 22:59:34 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 2 22:59:34 2015 +0100
----------------------------------------------------------------------
src/couch_att.erl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/f29e590c/src/couch_att.erl
----------------------------------------------------------------------
diff --git a/src/couch_att.erl b/src/couch_att.erl
index bab835e..932091b 100644
--- a/src/couch_att.erl
+++ b/src/couch_att.erl
@@ -248,7 +248,8 @@ merge_stubs(MemAtts, DiskAtts) ->
merge_stubs(MemAtts, OnDisk, []).
--spec merge_stubs([att()], dict(), [att()]) -> [att()].
+%% restore spec when R14 support is dropped
+%% -spec merge_stubs([att()], dict:dict(), [att()]) -> [att()].
merge_stubs([Att | Rest], OnDisk, Merged) ->
case fetch(data, Att) of
stub ->