Skip to content

Commit

Permalink
Merge pull request #5176 from yuxiaobo96/vitess-update
Browse files Browse the repository at this point in the history
Grammar tweak
  • Loading branch information
sougou authored Sep 10, 2019
2 parents d53de4f + 7d05ab5 commit ab42572
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions doc/meetups_notes/05-10-2018.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

* Finish full subquery support.
* Multi shard DML’s support of PR’s that are already opened.
* Getting all the docs done is too big of a project, for the next release we will go through all the pull requests that have been merged and create a release note based on that.
* Getting all the docs done is too big of a project, for the next release we will go through all the pull requests that have been merged and create a release note based on that.
* Once Planet Scale has a team in place, cadence for releases should be every couple months.

### Planet scale update
Expand All @@ -25,7 +25,7 @@

### Kubecon update from Sugu:

* It was awesome. Sugu presented in front of 4000 people.
* It was awesome. Sugu presented in front of 4000 people.
* Most people have heard about vitess before, but didn’t know exactly what vitess does. After Sugu’s presentation they do!
* Documentation keeps being a big debt on the project. Some ideas that were discussed:

Expand Down
2 changes: 1 addition & 1 deletion doc/meetups_notes/06-14-2018.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Or iPhone one-tap :

Or join by phone:

Dial(for higher quality, dial a number based on your current location)
Dial(for higher quality, dial a number based on your current location):
US: +1 646 558 8656 or +1 669 900 6833 or +1 877 369 0926 (Toll Free) or +1 877 853 5247 (Toll Free)

+1 855 703 8985 (Canada Toll-Free)
Expand Down
2 changes: 1 addition & 1 deletion doc/meetups_notes/details.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Or iPhone one-tap :

Or other phone:

Dial(for higher quality, dial a number based on your current location)
Dial(for higher quality, dial a number based on your current location):
US: +1 669 900 6833 or +1 646 558 8656 or +1 877 853 5247 (Toll Free) or +1 877 369 0926 (Toll Free)

Canada: +1 855 703 8985 (Canada Toll-Free)
Expand Down
10 changes: 5 additions & 5 deletions go/vt/vttablet/tabletmanager/healthcheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func TestHealthCheckControlsQueryService(t *testing.T) {
ctx := context.Background()
agent := createTestAgent(ctx, t, nil)

/// Consume the first health broadcast triggered by ActionAgent.Start():
// Consume the first health broadcast triggered by ActionAgent.Start():
// (REPLICA, NOT_SERVING) goes to (REPLICA, SERVING). And we
// should be serving.
if _, err := expectBroadcastData(agent.QueryServiceControl, true, "healthcheck not run yet", 0); err != nil {
Expand Down Expand Up @@ -281,7 +281,7 @@ func TestErrSlaveNotRunningIsHealthy(t *testing.T) {
ctx := context.Background()
agent := createTestAgent(ctx, t, nil)

/// Consume the first health broadcast triggered by ActionAgent.Start():
// Consume the first health broadcast triggered by ActionAgent.Start():
// (REPLICA, NOT_SERVING) goes to (REPLICA, SERVING). And we
// should be serving.
if _, err := expectBroadcastData(agent.QueryServiceControl, true, "healthcheck not run yet", 0); err != nil {
Expand Down Expand Up @@ -390,7 +390,7 @@ func TestQueryServiceStopped(t *testing.T) {
ctx := context.Background()
agent := createTestAgent(ctx, t, nil)

/// Consume the first health broadcast triggered by ActionAgent.Start():
// Consume the first health broadcast triggered by ActionAgent.Start():
// (REPLICA, NOT_SERVING) goes to (REPLICA, SERVING). And we
// should be serving.
if _, err := expectBroadcastData(agent.QueryServiceControl, true, "healthcheck not run yet", 0); err != nil {
Expand Down Expand Up @@ -488,7 +488,7 @@ func TestTabletControl(t *testing.T) {
ctx := context.Background()
agent := createTestAgent(ctx, t, nil)

/// Consume the first health broadcast triggered by ActionAgent.Start():
// Consume the first health broadcast triggered by ActionAgent.Start():
// (REPLICA, NOT_SERVING) goes to (REPLICA, SERVING). And we
// should be serving.
if _, err := expectBroadcastData(agent.QueryServiceControl, true, "healthcheck not run yet", 0); err != nil {
Expand Down Expand Up @@ -691,7 +691,7 @@ func TestStateChangeImmediateHealthBroadcast(t *testing.T) {
ctx := context.Background()
agent := createTestAgent(ctx, t, nil)

/// Consume the first health broadcast triggered by ActionAgent.Start():
// Consume the first health broadcast triggered by ActionAgent.Start():
// (REPLICA, NOT_SERVING) goes to (REPLICA, SERVING). And we
// should be serving.
if _, err := expectBroadcastData(agent.QueryServiceControl, true, "healthcheck not run yet", 0); err != nil {
Expand Down

0 comments on commit ab42572

Please sign in to comment.