Skip to content

Backport #6481 #6483

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

Closed
deepthi wants to merge 6 commits into from
+64 −64
Closed

Backport #6481 #6483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cf6517
[java] bump java version to 7.0 for release-7.0
harshit-gangal Jul 27, 2020
b53e1a2
Merge pull request #6479 from planetscale/java-7.0
deepthi Jul 27, 2020
695c8ba
Update user-facing terminology + copyright dates in tools/web_*
doeg Jul 27, 2020
6af7703
Regenerate static files to pick up terminology changes
doeg Jul 27, 2020
ec83346
More terminology updates: replica -> replication
doeg Jul 27, 2020
02eb3b8
Regenerate vtctld2 assets
doeg Jul 27, 2020
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
68 changes: 34 additions & 34 deletions go/vt/vtctld/rice-box.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion java/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<version>7.0.0</version>
</parent>
<artifactId>vitess-client</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion java/example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<version>7.0.0</version>
</parent>
<artifactId>vitess-example</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion java/grpc-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<version>7.0.0</version>
</parent>
<artifactId>vitess-grpc-client</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion java/jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>io.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<version>7.0.0</version>
</parent>
<artifactId>vitess-jdbc</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>io.vitess</groupId>
<artifactId>vitess-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<version>7.0.0</version>
<packaging>pom</packaging>

<name>Vitess Java Client libraries [Parent]</name>
Expand Down
2 changes: 1 addition & 1 deletion tools/web_bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019 The Vitess Authors.
# Copyright 2020 The Vitess Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion tools/web_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2019 The Vitess Authors.
# Copyright 2020 The Vitess Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion web/vtctld2/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
</head>
<body class="flex-column">
<vt-app-root class="flex-column flex-grow">Loading...</vt-app-root>
<script type="text/javascript" src="inline.js"></script><script type="text/javascript" src="styles.38b88af69dfd283498eb.bundle.js"></script><script type="text/javascript" src="main.3a2141f06032f2bc1229.bundle.js"></script></body>
<script type="text/javascript" src="inline.js"></script><script type="text/javascript" src="styles.38b88af69dfd283498eb.bundle.js"></script><script type="text/javascript" src="main.9a3d6a925af135b7c609.bundle.js"></script></body>
</html>
2 changes: 1 addition & 1 deletion web/vtctld2/app/inline.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions ...2/app/main.3a2141f06032f2bc1229.bundle.js → ...2/app/main.9a3d6a925af135b7c609.bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed ...pp/main.3a2141f06032f2bc1229.bundle.js.gz → ...pp/main.9a3d6a925af135b7c609.bundle.js.gz
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions web/vtctld2/src/app/dashboard/shard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ export class ShardComponent implements OnInit, OnDestroy {
if (!isMaster) {
// Add replication-related methods to the 'Change' section for slaves.
result[1].items.push(
{label: 'Start Slave', command: (event) => {this.openStartSlaveDialog(); }},
{label: 'Stop Slave', command: (event) => {this.openStopSlaveDialog(); }},
{label: 'Start Replication', command: (event) => {this.openStartSlaveDialog(); }},
{label: 'Stop Replication', command: (event) => {this.openStopSlaveDialog(); }},
);
}
if (this.featuresService.activeReparents) {
Expand Down Expand Up @@ -490,20 +490,20 @@ export class ShardComponent implements OnInit, OnDestroy {
}

openStartSlaveDialog() {
this.dialogSettings = new DialogSettings('Start', `Start Slave on ${this.selectedTablet.label}`,
`Restart replication on slave ${this.selectedTablet.label}.`,
`There was a problem starting slave on ${this.selectedTablet.label}:`);
this.dialogSettings.setMessage(`Started Slave on ${this.selectedTablet.label}`);
this.dialogSettings = new DialogSettings('Start', `Start replication on ${this.selectedTablet.label}`,
`Restart replication on ${this.selectedTablet.label}.`,
`There was a problem starting replication on ${this.selectedTablet.label}:`);
this.dialogSettings.setMessage(`Started replication on ${this.selectedTablet.label}`);
let flags = new PingTabletFlags(this.selectedTablet.alias).flags;
this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StartSlave');
this.dialogSettings.toggleModal();
}

openStopSlaveDialog() {
this.dialogSettings = new DialogSettings('Stop', `Stop Slave on ${this.selectedTablet.label}`,
`Stop replication on slave ${this.selectedTablet.label}. May render the tablet unhealthy.`,
`There was a problem stopping slave on ${this.selectedTablet.label}:`);
this.dialogSettings.setMessage(`Stopped Slave on ${this.selectedTablet.label}`);
this.dialogSettings = new DialogSettings('Stop', `Stop replication on ${this.selectedTablet.label}`,
`Stop replication on ${this.selectedTablet.label}. May render the tablet unhealthy.`,
`There was a problem stopping replication on ${this.selectedTablet.label}:`);
this.dialogSettings.setMessage(`Stopped replication on ${this.selectedTablet.label}`);
let flags = new PingTabletFlags(this.selectedTablet.alias).flags;
this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StopSlave');
this.dialogSettings.toggleModal();
Expand Down
12 changes: 6 additions & 6 deletions web/vtctld2/src/app/dashboard/tablet.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,19 @@ export class TabletComponent implements OnInit, OnDestroy {
}

openStartSlaveDialog() {
this.dialogSettings = new DialogSettings('Start', `Start Slave, ${this.tablet.label}`, '',
`There was a problem starting slave, ${this.tablet.label}:`);
this.dialogSettings.setMessage(`Started Slave, ${this.tablet.label}`);
this.dialogSettings = new DialogSettings('Start', `Start Replication, ${this.tablet.label}`, '',
`There was a problem starting replication on, ${this.tablet.label}:`);
this.dialogSettings.setMessage(`Started Replication, ${this.tablet.label}`);
this.dialogSettings.onCloseFunction = this.refreshTabletView.bind(this);
let flags = new PingTabletFlags(this.tablet.ref).flags;
this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StartSlave');
this.dialogSettings.toggleModal();
}

openStopSlaveDialog() {
this.dialogSettings = new DialogSettings('Stop', `Stop Slave, ${this.tablet.label}`, '',
`There was a problem stopping slave, ${this.tablet.label}:`);
this.dialogSettings.setMessage(`Stopped Slave, ${this.tablet.label}`);
this.dialogSettings = new DialogSettings('Stop', `Stop Replication, ${this.tablet.label}`, '',
`There was a problem stopping replication on, ${this.tablet.label}:`);
this.dialogSettings.setMessage(`Stopped Replication, ${this.tablet.label}`);
this.dialogSettings.onCloseFunction = this.refreshTabletView.bind(this);
let flags = new PingTabletFlags(this.tablet.ref).flags;
this.dialogContent = new DialogContent('tablet_alias', flags, {}, undefined, 'StopSlave');
Expand Down