DESCRIPTION

CBQE:0 Merge unmerged commit I546a261f06fef1cdae70183bff557a6181ef9106 + some additional checkpointing changes

Change-Id: I6ede6485f2652c302011055b5c3a5f2bf6a59905
Reviewed-on: http://review.couchbase.org/46452
Reviewed-by: Angelina Mayer <Angelina xxx@xxx.xxx
Tested-by: Angelina Mayer <Angelina xxx@xxx.xxx


COMMENTS

author: Angelina Mayer
date: 2015-02-05 19:32:21.894000000

Change has been successfully cherry-picked as 08b56a082bfa941467b55b250efadc86fbd9a8e8

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