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

[Upgrade Assistant] Align code between branches #91862

Merged
merged 9 commits into from
Feb 24, 2021
Merged

[Upgrade Assistant] Align code between branches #91862

merged 9 commits into from
Feb 24, 2021

Commits on Feb 17, 2021

  1. merge 7.x code

    @alisonelizabeth
    alisonelizabeth committed Feb 17, 2021
    Configuration menu
    Copy the full SHA
    2e4163d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. remove irrelevant code

    @alisonelizabeth
    alisonelizabeth committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    2e2e92f View commit details
    Browse the repository at this point in the history

  2. add version-specific logic

    @alisonelizabeth
    alisonelizabeth committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    bc7ec3b View commit details
    Browse the repository at this point in the history

  3. update i18n

    @alisonelizabeth
    alisonelizabeth committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    4556e74 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2021

  1. Merge branch 'master' into ua/align_branches

    @kibanamachine
    kibanamachine authored Feb 19, 2021
    Configuration menu
    Copy the full SHA
    bde335f View commit details
    Browse the repository at this point in the history

  2. update mapping type warning message

    @alisonelizabeth
    alisonelizabeth committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    ccecb36 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. Merge branch 'master' into ua/align_branches

    @kibanamachine
    kibanamachine authored Feb 22, 2021
    Configuration menu
    Copy the full SHA
    04ce802 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2021

  1. Merge branch 'master' of https://github.com/elastic/kibana into ua/al… 

    …ign_branches
    @alisonelizabeth
    alisonelizabeth committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    eac1feb View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. address review feedback

    @alisonelizabeth
    alisonelizabeth committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    b948291 View commit details
    Browse the repository at this point in the history