Skip to content

Conversation

@jloleysens
Copy link
Contributor

Backports the following commits to 7.x:

* Move fp-ts and immer to "." package.json

* Revert "Move fp-ts and immer to "." package.json"

This reverts commit b876df0.

* Second attempt, fp-ts and immer -> root

* fp-ts -> 2.3.1

* Revert x-pack/package.json

* Update fp-ts in x-pack/package.json

Co-authored-by: Elastic Machine <[email protected]>
@jloleysens jloleysens added the backport This PR is a backport of another PR label Jan 7, 2020
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

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

@jloleysens jloleysens merged commit 50a5274 into elastic:7.x Jan 7, 2020
@jloleysens jloleysens deleted the backport/7.x/pr-53885 branch January 7, 2020 14:03
jloleysens added a commit to jloleysens/kibana that referenced this pull request Jan 7, 2020
…52893

* '7.x' of github.com:elastic/kibana:
  [Console] Fix OSS build (elastic#53885) (elastic#54094)
  [Console] Console with better SQL support (elastic#51446) (elastic#54091)
  Fix suggested value for time_zone in range query (elastic#53841) (elastic#54092)
  [APM] Show errors on the timeline instead of under the transaction (elastic#53756) (elastic#54109)
  use NP deprecations in uiSettings (elastic#53755) (elastic#54009)
  adding message to transaction and span metadata (elastic#54017) (elastic#54090)

# Conflicts:
#	x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants