Merge "Merge remote-tracking branch 'couchbase/3.0.x' into sherlock" into sherlock
authorDave Rigby <daver@couchbase.com>
Fri, 17 Jun 2016 10:20:42 +0000 (10:20 +0000)
committerGerrit Code Review <gerrit@li94-158.members.linode.com>
Fri, 17 Jun 2016 10:20:42 +0000 (10:20 +0000)
commit717ceb4b169cdd52c9f8439c7410d5cf78961b3b
tree80fd2427bc681d7384d2cb5713819561f9cd1d2b
parentfd58a4d1ce22566c82ee4cf7f02891884dc291d5
parentd7ca7213ad1f807d23a365ea410a55507fa10fd0
Merge "Merge remote-tracking branch 'couchbase/3.0.x' into sherlock" into sherlock