Merge "Merge remote-tracking branch 'couchbase/3.0.x' into sherlock" into sherlock
authorDave Rigby <daver@couchbase.com>
Fri, 17 Jun 2016 08:29:58 +0000 (08:29 +0000)
committerGerrit Code Review <gerrit@li94-158.members.linode.com>
Fri, 17 Jun 2016 08:29:58 +0000 (08:29 +0000)
commita3d2bc15f79b378e0f787f23e4ccf5a6c3199c2a
tree7ad1528738b01fa2331309e438c4cddfe18c08f4
parent7b11a7f3c1ec2e4dc3d0e3c1e719f5621fa206a6
parent4df7c17eac1320ac6be3269e637911957244dc6a
Merge "Merge remote-tracking branch 'couchbase/3.0.x' into sherlock" into sherlock