Skip to content

Actually deleting x-pack/tsconfig.refs.json#90898

Merged
mshustov merged 1 commit intoelastic:masterfrom
kobelb:actually-deleting
Feb 10, 2021
Merged

Actually deleting x-pack/tsconfig.refs.json#90898
mshustov merged 1 commit intoelastic:masterfrom
kobelb:actually-deleting

Conversation

@kobelb
Copy link
Copy Markdown
Contributor

@kobelb kobelb commented Feb 10, 2021

This was supposed to be done as part of #90537, but I messed up when merging upstream.

@kobelb kobelb added release_note:skip Skip the PR/issue when compiling release notes v8.0.0 v7.12.0 labels Feb 10, 2021
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@mshustov mshustov added the auto-backport Deprecated - use backport:version if exact versions are needed label Feb 10, 2021
@mshustov mshustov merged commit 240da2b into elastic:master Feb 10, 2021
@kibanamachine
Copy link
Copy Markdown
Contributor

Backport result

{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"meta":{"labels":["auto-backport","release_note:skip","v7.12.0","v8.0.0"],"branchLabelMapping":{"^v8.0.0$":"master","^v7.12.0$":"7.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"},"existingTargetPullRequests":[]},"level":"info","message":"Inputs when calculating target branches:"}
{"meta":["7.x"],"level":"info","message":"Target branches inferred from labels:"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm kibanamachine","stdout":"","stderr":"error: No such remote: 'kibanamachine'\n"},"level":"info","message":"exec error 'git remote rm kibanamachine':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm elastic","stdout":"","stderr":"error: No such remote: 'elastic'\n"},"level":"info","message":"exec error 'git remote rm elastic':"}
{"level":"info","message":"Backporting [{\"sourceBranch\":\"master\",\"targetBranchesFromLabels\":[\"7.x\"],\"sha\":\"240da2bf2a999501eddc378466e67ebb8e26df76\",\"formattedMessage\":\"Actually deleting x-pack/tsconfig.refs.json (#90898)\",\"originalMessage\":\"Actually deleting x-pack/tsconfig.refs.json (#90898)\",\"pullNumber\":90898,\"existingTargetPullRequests\":[]}] to 7.x"}

Backporting to 7.x:
{"level":"info","message":"Backporting via filesystem"}
{"meta":{"killed":false,"code":1,"signal":null,"cmd":"git cherry-pick 240da2bf2a999501eddc378466e67ebb8e26df76","stdout":"CONFLICT (modify/delete): x-pack/tsconfig.refs.json deleted in 240da2bf2a9 (Actually deleting x-pack/tsconfig.refs.json (#90898)) and modified in HEAD. Version HEAD of x-pack/tsconfig.refs.json left in tree.\n","stderr":"error: could not apply 240da2bf2a9... Actually deleting x-pack/tsconfig.refs.json (#90898)\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n"},"level":"info","message":"exec error 'git cherry-pick 240da2bf2a999501eddc378466e67ebb8e26df76':"}
Commit could not be cherrypicked due to conflicts

gmmorris added a commit to gmmorris/kibana that referenced this pull request Feb 10, 2021
* master: (99 commits)
  [Fleet] Use Fleet Server indices in the search bar (elastic#90835)
  [Search Sessions] added an info flyout to session management (elastic#90559)
  [ILM] Revisit searchable snapshot field after new redesign (elastic#90793)
  [Alerting] License Errors on Alert List View (elastic#89920)
  RFC Improve saved object migrations algorithm (elastic#84333)
  [Lens] (Accessibility) Fix focus on drag and drop actions (elastic#90561)
  Use new shortcut links to Fleet discuss forums. (elastic#90786)
  Do not generate an ephemeral encryption key in production. (elastic#81511)
  [Fleet] Use staging registry for snapshot builds (elastic#90327)
  Actually deleting x-pack/tsconfig.refs.json (elastic#90898)
  Add deprecation warning to all Beats CM pages. (elastic#90741)
  skip flaky suite (elastic#90136)
  Revert "Revert "[Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)"" (elastic#90889)
  remove ref to removed tsconfig file
  [core.logging] Uses host timezone as default (elastic#90368)
  [Maps] remove maps_file_upload plugin and fold public folder into file_upload plugin (elastic#90292)
  Revert "[Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)"
  [dev-utils/ci-stats] support disabling ship errors (elastic#90851)
  Prefix with / (elastic#90836)
  [Metrics UI] Add Metrics Anomaly Alert Type (elastic#89244)
  ...
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Feb 12, 2021
@kibanamachine
Copy link
Copy Markdown
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 90898 or prevent reminders by adding the backport:skip label.

1 similar comment
@kibanamachine
Copy link
Copy Markdown
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create backports run node scripts/backport --pr 90898 or prevent reminders by adding the backport:skip label.

@mshustov mshustov added backport:skip This PR does not require backporting backported labels Feb 15, 2021
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Feb 15, 2021
@mshustov mshustov removed the auto-backport Deprecated - use backport:version if exact versions are needed label Feb 15, 2021
@mshustov
Copy link
Copy Markdown
Contributor

backported in #90912

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:skip This PR does not require backporting backported release_note:skip Skip the PR/issue when compiling release notes v7.12.0 v8.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants