DESCRIPTION

changes for adding monitoring automation and advanced cbq changes for windows.

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


COMMENTS

author: Tate Garrett
date: 2016-03-08 19:08:15.399000000

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-03-08 19:08:28.630000000

Change has been successfully cherry-picked as faacb383fd3f8243ebbc9d0766e4e4fb21982dd8

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