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.

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

[docs] Remove repeating words #33087

Merged
merged 2 commits into from
Aug 28, 2018
Merged

[docs] Remove repeating words #33087

merged 2 commits into from
Aug 28, 2018

Conversation

lipsill
Copy link
Contributor

@lipsill lipsill commented Aug 23, 2018

Trivial change removing repeating words from a few docs

@jtibshirani jtibshirani added >docs General docs changes v7.0.0 v6.5.0 labels Aug 23, 2018
@jtibshirani
Copy link
Contributor

@elasticmachine test this please

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

@lipsill
Copy link
Contributor Author

lipsill commented Aug 27, 2018

@jtibshirani thanks for starting a build!

I see that the CI failed with an error. I am not familiar with the build process, but going out on a limb, I would assume that the failure is not caused by this PR (only .asciidoc changes).

Can somebody have a look why the build failed? Agent running out of space? Another issue bubbling up? Thanks!

> Task :distribution:bwc:staged-minor-snapshot:buildBwcVersion FAILED
FAILURE: Build failed with an exception.

* Where:
Build file '/var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/build.gradle' line: 193
:distribution:bwc:staged-minor-snapshot:buildBwcVersion (Thread[Task worker for ':',5,main]) completed. Took 2 mins 5.066 secs.

3094 actionable tasks: 2012 executed, 1082 up-to-date
* What went wrong:
Execution failed for task ':distribution:bwc:staged-minor-snapshot:buildBwcVersion'.
> Building bwc version didn't generate expected files [/var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/staged-minor-snapshot/build/bwc/checkout-6.4/distribution/archives/oss-zip/build/distributions/elasticsearch-oss-6.4.0-SNAPSHOT.zip, /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/staged-minor-snapshot/build/bwc/checkout-6.4/distribution/archives/zip/build/distributions/elasticsearch-6.4.0-SNAPSHOT.zip, /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/staged-minor-snapshot/build/bwc/checkout-6.4/distribution/packages/oss-deb/build/distributions/elasticsearch-oss-6.4.0-SNAPSHOT.deb, /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/staged-minor-snapshot/build/bwc/checkout-6.4/distribution/packages/deb/build/distributions/elasticsearch-6.4.0-SNAPSHOT.deb, /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/staged-minor-snapshot/build/bwc/checkout-6.4/distribution/packages/oss-rpm/build/distributions/elasticsearch-oss-6.4.0-SNAPSHOT.rpm, /var/lib/jenkins/workspace/elastic+elasticsearch+pull-request/distribution/bwc/staged-minor-snapshot/build/bwc/checkout-6.4/distribution/packages/rpm/build/distributions/elasticsearch-6.4.0-SNAPSHOT.rpm]

@hub-cap
Copy link
Contributor

hub-cap commented Aug 27, 2018

Yes, these are definitely not due to your build causing failures. That was due to a version bump upgrade that takes time to sort out before builds go green again. We did just merge another BWC affecting change, and you need to have it in this branch before tests pass. If you just run the following, substitutuing out upstream for whatever you have called the elastic org's elasticsearch repo.

git fetch upstream
git merge upstream/master

After merging in the upstream commits, just push to your branch to update the PR and we can kick off a CI run.

@lipsill
Copy link
Contributor Author

lipsill commented Aug 27, 2018

@hub-cap thanks for looking into this! And explaining what went wrong:)

PR updated.

Copy link
Member

@cbuescher cbuescher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I don't think this needs another CI run since there are no changes here that affect any tests or docs tests. I just built the docs itself and that looks okay. Will merge this in.

@cbuescher cbuescher merged commit b7c0d28 into elastic:master Aug 28, 2018
cbuescher pushed a commit that referenced this pull request Aug 28, 2018
cbuescher pushed a commit that referenced this pull request Aug 28, 2018
@lipsill
Copy link
Contributor Author

lipsill commented Aug 28, 2018

Thanks @cbuescher :)

dnhatn added a commit that referenced this pull request Aug 28, 2018
* master:
  [Rollup] Better error message when trying to set non-rollup index (#32965)
  HLRC: Use Optional in validation logic (#33104)
  Remove unused User class from protocol (#33137)
  ingest: Introduce the dissect processor (#32884)
  [Docs] Add link to es-kotlin-wrapper-client (#32618)
  [Docs] Remove repeating words (#33087)
  Minor spelling and grammar fix (#32931)
  Remove support for deprecated params._agg/_aggs for scripted metric aggregations (#32979)
  Watcher: Simplify finding next date in cron schedule (#33015)
  Run Third party audit with forbidden APIs CLI  (part3/3) (#33052)
  Fix plugin build test on Windows (#33078)
  HLRC+MINOR: Remove Unused Private Method (#33165)
  Remove old unused test script files (#32970)
  Build analysis-icu client JAR (#33184)
  Ensure to generate identical NoOp for the same failure (#33141)
  ShardSearchFailure#readFrom to set index and shardId (#33161)
dnhatn added a commit that referenced this pull request Aug 28, 2018
* 6.x:
  [Rollup] Better error message when trying to set non-rollup index (#32965)
  Remove unused User class from protocol (#33137)
  [DOCS] Adds link to 6.3.0 release highlights
  Test: fix token bwc tests due to bad backport
  Ensure to generate identical NoOp for the same failure (#33141)
  [Docs] Add link to es-kotlin-wrapper-client (#32618)
  [Docs] Remove repeating words (#33087)
  Minor spelling and grammar fix (#32931)
  Run Third party audit with forbidden APIs CLI  (part3/3) (#33052)
  Fix plugin build test on Windows (#33078)
  Watcher: Simplify finding next date in cron schedule (#33015)
  Remove old unused test script files (#32970)
  Build analysis-icu client JAR (#33184)
  Switch remaining tests to new style Requests (#33109)
  Use internal connection manager when fetching remote node info
  Switch remaining x-pack tests to new style Requests (#33108)
  Switch remaining ml tests to new style Requests (#33107)
  Token API supports the client_credentials grant (#33106)
@lipsill lipsill deleted the docs_repeats branch September 4, 2018 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants