DESCRIPTION

CBQE-1705:  replace changes that failed to merge from Jasmin Rangel:

  http://review.couchbase.org/#/c/31574
  http://review.couchbase.org/#/c/31577

Change-Id: I90fd61cddc962a75b4a48138b09e87db1be9111d


COMMENTS

author: Hugo Blankenship
date: 2014-01-06 20:17:08.394000000

Patch Set 1:

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

-------------------------------------
author: Hugo Blankenship
date: 2014-01-06 20:18:35.616000000

Patch Set 1: Verified-1

Build Failed 

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

-------------------------------------
author: Hugo Blankenship
date: 2014-01-06 20:19:13.744000000

Patch Set 1: -Verified

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

-------------------------------------
author: Hugo Blankenship
date: 2014-01-06 20:47:49.126000000

Patch Set 1: Verified+1

Build Successful 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/99/ : SUCCESS

-------------------------------------
author: Sean Khan
date: 2014-01-06 20:49:33.928000000

Patch Set 1: Code-Review+2

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