DESCRIPTION

changes for merge.

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


COMMENTS

author: Tate Garrett
date: 2015-10-16 19:19:35.496000000

Change has been successfully cherry-picked as e4a84c3365b5c032e403691d1f31b80f8e75bcf1

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