Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cluster: Create final cluster version for 2.1 #31221

Merged
merged 1 commit into from
Oct 10, 2018
Merged

cluster: Create final cluster version for 2.1 #31221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/generated/settings/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@
<tr><td><code>trace.debug.enable</code></td><td>boolean</td><td><code>false</code></td><td>if set, traces for recent requests can be seen in the /debug page</td></tr>
<tr><td><code>trace.lightstep.token</code></td><td>string</td><td><code></code></td><td>if set, traces go to Lightstep using this token</td></tr>
<tr><td><code>trace.zipkin.collector</code></td><td>string</td><td><code></code></td><td>if set, traces go to the given Zipkin instance (example: '127.0.0.1:9411'); ignored if trace.lightstep.token is set.</td></tr>
<tr><td><code>version</code></td><td>custom validation</td><td><code>2.0-14</code></td><td>set the active cluster version in the format '<major>.<minor>'.</td></tr>
<tr><td><code>version</code></td><td>custom validation</td><td><code>2.1</code></td><td>set the active cluster version in the format '<major>.<minor>'.</td></tr>
</tbody>
</table>
2 changes: 1 addition & 1 deletion pkg/server/updates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ func TestReportUsage(t *testing.T) {
"diagnostics.reporting.send_crash_reports": "false",
"server.time_until_store_dead": "1m30s",
"trace.debug.enable": "false",
"version": "2.0-14",
"version": cluster.BinaryServerVersion.String(),
"cluster.secret": "<redacted>",
} {
if got, ok := r.last.AlteredSettings[key]; !ok {
Expand Down
6 changes: 6 additions & 0 deletions pkg/settings/cluster/cockroach_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const (
VersionRangeMerges
VersionBitArrayColumns
VersionLoadBasedRebalancing
Version2_1

// Add new versions here (step one of two).

Expand Down Expand Up @@ -283,6 +284,11 @@ var versionsSingleton = keyedVersions([]keyedVersion{
Key: VersionLoadBasedRebalancing,
Version: roachpb.Version{Major: 2, Minor: 0, Unstable: 14},
},
{
// Version2_1 is CockroachDB v2.1. It's used for all v2.1.x patch releases.
Key: Version2_1,
Version: roachpb.Version{Major: 2, Minor: 1},
},

// Add new versions here (step two of two).

Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/logictest/testdata/logic_test/crdb_internal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ select crdb_internal.set_vmodule('')
query T
select crdb_internal.node_executable_version()
----
2.0-14
2.1

query ITTT colnames
select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
Expand Down Expand Up @@ -359,4 +359,4 @@ select * from crdb_internal.gossip_alerts
query T
select crdb_internal.node_executable_version()
----
2.0-14
2.1