Author: kocolosk
Date: Sun Apr 11 23:58:43 2010
New Revision: 933042
URL: http://svn.apache.org/viewvc?rev=933042&view=rev
Log:
bugfix for replication keepalive. Closes COUCHDB-730
Modified:
couchdb/branches/0.11.x/ (props changed)
couchdb/branches/0.11.x/etc/default/couchdb (props changed)
couchdb/branches/0.11.x/src/couchdb/couch_rep.erl
Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 11 23:58:43 2010
@@ -6,4 +6,4 @@
/couchdb/branches/list-iterator:782292-784593
/couchdb/branches/tail_header:775760-778477
/couchdb/tags/0.10.0:825400
-/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039
Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 11 23:58:43 2010
@@ -6,5 +6,5 @@
/couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
/couchdb/branches/tail_header/etc/default/couchdb:775760-778477
/couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.11.x/src/couchdb/couch_rep.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_rep.erl?rev=933042&r1=933041&r2=933042&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_rep.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_rep.erl Sun Apr 11 23:58:43 2010
@@ -650,8 +650,7 @@ commit_to_both(Source, Target, RequiredS
ensure_full_commit(#http_db{} = Target) ->
Req = Target#http_db{
resource = "_ensure_full_commit",
- method = post,
- body = true
+ method = post
},
{ResultProps} = couch_rep_httpc:request(Req),
true = proplists:get_value(<<"ok">>, ResultProps),
@@ -676,7 +675,6 @@ ensure_full_commit(#http_db{} = Source,
Req = Source#http_db{
resource = "_ensure_full_commit",
method = post,
- body = true,
qs = [{seq, RequiredSeq}]
},
{ResultProps} = couch_rep_httpc:request(Req),
