Skip to content

Commit 54447f0

Browse files
committed
Merge branch 'morpheus' into 'master'
* morpheus: DOC-13627 Remove all mentions of memcached bucket from docs DOC-13627 Remove memcached bucket from bucket-create docs MB-68917 Bump docs version to 8.0 MB-68460 Use official coverage plugin MB-68462:[BP] Fix eshell after migrating to erlang 26 MB-68545[BP]: Fix eshell after migrating to erlang 26 Change-Id: I7c7f987b2beea7fb44b1dc570efb91677720d0f4
2 parents 2d0d006 + cb389c3 commit 54447f0

File tree

4 files changed

+15
-29
lines changed

4 files changed

+15
-29
lines changed

Jenkinsfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,13 @@ pipeline {
184184
// Post the test results
185185
junit allowEmptyResults: true, testResults: "reports/test-*.xml"
186186

187-
// Post the test coverage
188-
cobertura autoUpdateStability: false, autoUpdateHealth: false, onlyStable: false, coberturaReportFile: "reports/coverage-*.xml", conditionalCoverageTargets: "70, 10, 30", failNoReports: false, failUnhealthy: true, failUnstable: true, lineCoverageTargets: "70, 10, 30", methodCoverageTargets: "70, 10, 30", maxNumberOfBuilds: 0, sourceEncoding: "ASCII", zoomCoverageChart: false
187+
// Post the test coverage using the official Jenkins Coverage plugin
188+
recordCoverage(
189+
tools: [[parser: 'COBERTURA', pattern: 'reports/coverage-cli.xml']],
190+
qualityGates: [[threshold: 50.0, metric: 'LINE', baseline: 'PROJECT']],
191+
sourceDirectories: [[path: "couchbase-cli/"]],
192+
sourceCodeRetention: "LAST_BUILD",
193+
)
189194
}
190195

191196
success {

docs/modules/cli/pages/cbcli/couchbase-cli-bucket-create.adoc

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ _couchbase-cli bucket-create_ [--cluster <url>] [--username <user>]
3535

3636
== DESCRIPTION
3737

38-
Creates a new bucket. Allows creation of Couchbase, Ephemeral, and Memcached
39-
buckets, and supports the various configuration parameters for these
40-
buckets.
38+
Creates a new bucket. Allows creation of Couchbase and Ephemeral buckets, and
39+
supports the various configuration parameters for these buckets.
4140

4241
== OPTIONS
4342

@@ -50,15 +49,11 @@ include::{partialsdir}/cbcli/part-common-options.adoc[]
5049
maximum of 100 characters in length.
5150

5251
--bucket-type <type>::
53-
The type of bucket to create. Accepted bucket types are "couchbase",
54-
"ephemeral", and "memcached". The Couchbase bucket is the standard bucket
55-
type. It supports data persistence, replication, caching, indexing, views,
56-
and {sqlpp} queries. The Ephemeral bucket is an in-memory bucket similar to the
57-
Couchbase bucket; but it does not support data persistence or views. The
58-
Memcached bucket is a cache-only bucket that does not support persistence,
59-
replication, indexing, views, or {sqlpp} querying: this bucket type provides
60-
the same behavior as Memcached Server. Memcached buckets are removed as of 8.0
61-
and Ephemeral buckets should be used instead.
52+
The type of bucket to create. Accepted bucket types are "couchbase" and
53+
"ephemeral". The Couchbase bucket is the standard bucket type. It supports
54+
data persistence, replication, caching, indexing, views, and {sqlpp} queries.
55+
The Ephemeral bucket is an in-memory bucket similar to the Couchbase bucket;
56+
but it does not support data persistence or views.
6257

6358
--storage-backend <storage>::
6459
The type of storage to use with the bucket. This is only specified for
@@ -292,13 +287,6 @@ enabled, and view index replication enabled, run the following command.
292287
--bucket-eviction-policy fullEviction --enable-flush 1 \
293288
--enable-index-replica 1
294289

295-
To create a Memcached bucket named "travel-data" with a memory cache size
296-
of 1GB, run the following command.
297-
298-
$ couchbase-cli bucket-create -c 192.168.1.5:8091 --username Administrator \
299-
--password password --bucket travel-data --bucket-type memcached \
300-
--bucket-ramsize 1024
301-
302290
To create an Ephemeral bucket named "hotel-data" synchronously, with a memory
303291
cache size of 256MiB, flushing enabled, "nruEviction", and timestamp-based
304292
conflict resolution, run the following command.

docs/modules/cli/pages/cbcli/couchbase-cli-bucket-flush.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ _couchbase-cli bucket-flush_ [--cluster <url>] [--username <user>] [--password <
2020

2121
Deletes all data from a bucket. The bucket itself is not deleted; and all
2222
its indexes and configuration-details remain unchanged. Applies to
23-
Couchbase, Ephemeral, and Memcached buckets.
23+
Couchbase and Ephemeral buckets.
2424

2525
== OPTIONS
2626

docs/modules/cli/pages/cbcli/couchbase-cli-bucket-list.adoc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ $ couchbase-cli bucket-list -c 192.168.1.5:8091 --username Administrator \
5050
ramQuota: 268435456
5151
ramUsed: 1134432
5252
vBuckets: 1024
53-
flight-data
54-
bucketType: memcached
55-
numReplicas: 0
56-
ramQuota: 104857600
57-
ramUsed: 0
58-
vBuckets: 1024
59-
----
6053
== DISCUSSION
6154
6255
In the output, RAM figures are in bytes. The "membase" bucketType signifies a

0 commit comments

Comments
 (0)