DESCRIPTION

changes.

Change-Id: Id5f0b24171afd6abfad473b5692b657d163bc0eb
Reviewed-on: http://review.couchbase.org/59671
Reviewed-by: Monique Barker <Monique xxx@xxx.xxx
Tested-by: Monique Barker <Monique xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2016-02-09 19:20:20.074000000

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

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

-------------------------------------
author: Tate Garrett
date: 2016-02-09 19:20:28.028000000

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

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

-------------------------------------
author: Tate Garrett
date: 2016-02-09 19:23:58.930000000

Change has been successfully cherry-picked as 7d2cecf1371ee059f30283b4f8ff3d3558bb7be9

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