DESCRIPTION

Revert "CBQE-0: fix for bixdcr.load_with_async_ops_and_joint_sets tests"

This reverts commit f8a6d509d0600fb352ef520f6c910126e4510033.

Change-Id: I4c6fa75deb1721e753f06c7ce1813889e0d7eec6


COMMENTS

author: Angelina Mayer
date: 2014-01-31 01:43:41.877000000

Patch Set 1: Verified+1 Code-Review+2

Reverting the previous change as it renders xdcr-conflict resolution void. Thanks.

-------------------------------------
author: Tate Garrett
date: 2014-01-31 01:43:44.252000000

The change could not be merged due to a path conflict.

Please rebase the change locally and upload the rebased commit for review.

-------------------------------------
author: Angelina Mayer
date: 2014-01-31 01:44:53.416000000

Patch Set 2: Patch Set 1 was rebased

-------------------------------------
author: Hugo Blankenship
date: 2014-01-31 01:55:10.454000000

Patch Set 1:

Build Started http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/295/

-------------------------------------
author: Hugo Blankenship
date: 2014-01-31 02:25:41.453000000

Patch Set 1:

Build Failed 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/295/ : FAILURE

-------------------------------------
