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

[Management] Enable index pattern version conflicts #18937

Merged
merged 10 commits into from
May 22, 2018
Merged

[Management] Enable index pattern version conflicts #18937

merged 10 commits into from
May 22, 2018

Commits on May 15, 2018

  1. Pass the version along so we can get version conflict errors, then tr… 

    …y and resolve if we can
    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    91ffaa6 View commit details
    Browse the repository at this point in the history

  2. Update the version post save

    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    de81db6 View commit details
    Browse the repository at this point in the history

  3. Refactor slightly to match setId pattern

    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    c3813fb View commit details
    Browse the repository at this point in the history

  4. Tests and updates to ensure the actual changes aren't clobbered

    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    9444ccd View commit details
    Browse the repository at this point in the history

  5. Ensure we return the id

    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    d20b289 View commit details
    Browse the repository at this point in the history

  6. Avoid infinite recursion, welcome suggestions on how to unit test this

    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    b032be6 View commit details
    Browse the repository at this point in the history

  7. Change logic for refresh fields UI button. Now it will re-call init a… 

    …nd force a fields refresh. This ensures we pick up on field format (and other) changes
    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    8e65b02 View commit details
    Browse the repository at this point in the history

  8. Fix a couple issues with saving field formats, elastic#19037

    @chrisronline
    chrisronline committed May 15, 2018
    Configuration menu
    Copy the full SHA
    af6fdda View commit details
    Browse the repository at this point in the history

Commits on May 18, 2018

  1. Use the right key for version

    @chrisronline
    chrisronline committed May 18, 2018
    Configuration menu
    Copy the full SHA
    f1f29e4 View commit details
    Browse the repository at this point in the history

  2. Merge in master

    @chrisronline
    chrisronline committed May 18, 2018
    Configuration menu
    Copy the full SHA
    01c8388 View commit details
    Browse the repository at this point in the history