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

Update Cortex to latest master #1869

Merged
merged 8 commits into from
Apr 14, 2020
Merged

Update Cortex to latest master #1869

merged 8 commits into from
Apr 14, 2020

Commits on Apr 7, 2020

  1. Update Cortex to master 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    d9fade8 View commit details
    Browse the repository at this point in the history

  2. Fix compilation errors after Cortex update. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    e48fda1 View commit details
    Browse the repository at this point in the history

  3. Update to Cortex v1.0.0-rc.0 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    00f15f1 View commit details
    Browse the repository at this point in the history

  4. Added missing vendored file. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    d1f0db4 View commit details
    Browse the repository at this point in the history

  5. Vendor Cortex 1.0.0 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    44449e7 View commit details
    Browse the repository at this point in the history

  6. Configuration changes. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    9a52583 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Mention Cortex 1.0 changes and link to docs. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    8082987 View commit details
    Browse the repository at this point in the history

  2. Fix jsonnet files, and mention fields that were removed. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    b26f391 View commit details
    Browse the repository at this point in the history