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.

Sign up for GitHub

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

Jump to bottom

[Maps] fix term join agg key collision #63324

Merged
merged 10 commits into from
Apr 17, 2020
Merged

[Maps] fix term join agg key collision #63324

merged 10 commits into from
Apr 17, 2020

Commits on Apr 12, 2020

  1. [Maps] fix term join agg key collision

    @nreese
    nreese committed Apr 12, 2020
    Configuration menu
    Copy the full SHA
    6e0c937 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. Merge branch 'master' into join_agg_key

    @elasticmachine
    elasticmachine authored Apr 13, 2020
    Configuration menu
    Copy the full SHA
    6ec1ebf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:elastic/kibana into join_agg_key

    @nreese
    nreese committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    238639a View commit details
    Browse the repository at this point in the history

  3. fix tslint and jest errors

    @nreese
    nreese committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    e2ac7d7 View commit details
    Browse the repository at this point in the history

  4. merge with master

    @nreese
    nreese committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    13cad80 View commit details
    Browse the repository at this point in the history

  5. fix join functional test

    @nreese
    nreese committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    2a12c76 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Merge branch 'master' into join_agg_key

    @elasticmachine
    elasticmachine authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    1f7080b View commit details
    Browse the repository at this point in the history

  2. revert LayerDescriptor union and cast to VectorLayerDescriptor instead

    @nreese
    nreese committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    3c6c15d View commit details
    Browse the repository at this point in the history

  3. move getJoinKey out of constants and into its own file

    @nreese
    nreese committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    7f49c09 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into join_agg_key

    @elasticmachine
    elasticmachine authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    2343f47 View commit details
    Browse the repository at this point in the history