Skip to content

Conversation

@matriv
Copy link
Contributor

@matriv matriv commented Nov 27, 2018

Remove trailing line feed from the output of the command to get
the number of CPUs.

Follow up to: #35789

Remove trailing line feed from the output of the command to get
the number of CPUs.

Follow up to: elastic#35789
@matriv matriv added :Delivery/Build Build or test infrastructure v7.0.0 v6.6.0 labels Nov 27, 2018
@matriv matriv requested a review from nik9000 November 27, 2018 20:13
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra

standardOutput = stdout
}
return stdout.toString('UTF-8')
return stdout.toString('UTF-8').replace(System.lineSeparator(), "");
Copy link
Member

Choose a reason for hiding this comment

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

I think you could just use .trim()?

Copy link
Member

@rjernst rjernst left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@nik9000 nik9000 left a comment

Choose a reason for hiding this comment

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

How did I miss this!? Thanks.

@matriv
Copy link
Contributor Author

matriv commented Nov 27, 2018

@nik9000 no worries!

@matriv matriv merged commit af9233b into elastic:master Nov 27, 2018
@matriv matriv deleted the mt/fix-macos-build branch November 27, 2018 20:31
matriv added a commit that referenced this pull request Nov 27, 2018
Remove trailing line feed from the output of the command to get
the number of CPUs.

Follow up to: #35789
@matriv
Copy link
Contributor Author

matriv commented Nov 27, 2018

Backported to 6.x with 5c5914b

jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Nov 28, 2018
* master:
  DOCS Audit event attributes in new format (elastic#35510)
  Scripting: Actually add joda time back to whitelist (elastic#35965)
  [DOCS] fix HLRC ILM doc misreferenced tag
  Add realm information for Authenticate API (elastic#35648)
  [ILM] add HLRC docs to remove-policy-from-index (elastic#35759)
  [Rollup] Update serialization version after backport
  [Rollup] Add more diagnostic stats to job (elastic#35471)
  Build: Fix gradle build for Mac OS (elastic#35968)
  Adds deprecation logging to ScriptDocValues#getValues. (elastic#34279)
  [Monitoring] Make Exporters Async (elastic#35765)
  [ILM] reduce time restriction on IndexLifecycleExplainResponse (elastic#35954)
  Remove use of AbstractComponent in xpack (elastic#35394)
  Deprecate types in search and multi search templates. (elastic#35669)
  Remove fromXContent from IndexUpgradeInfoResponse (elastic#35934)
@mark-vieira mark-vieira added the Team:Delivery Meta label for Delivery team label Nov 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v6.6.0 v7.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants