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

Fix duplicate labels (update cortex) #1280

Merged
merged 6 commits into from
Nov 19, 2019
Merged

Fix duplicate labels (update cortex) #1280

merged 6 commits into from
Nov 19, 2019

Commits on Nov 14, 2019

  1. Update to latest cortex to fix duplicate labels 

    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    @cyriltovena
    cyriltovena committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    9d191db View commit details
    Browse the repository at this point in the history

  2. Start the licycler in the ingester 

    Required since this cortex change in https://github.com/cortexproject/cortex/commit/00566f61af49f2dd8257413d9e49a3053f708fce\#diff-dcd65a4ff2de424be70a561f141e067bR180

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    @cyriltovena
    cyriltovena committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    1741dac View commit details
    Browse the repository at this point in the history

  3. go mod tidy 

    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    @cyriltovena
    cyriltovena committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    a726ee9 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2019

  1. Move cortex to a fork for ARM support 

    Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
    @cyriltovena
    cyriltovena committed Nov 15, 2019
    Configuration menu
    Copy the full SHA
    8a48b14 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. updates cortex to master 

    Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
    @owen-d
    owen-d committed Nov 18, 2019
    Configuration menu
    Copy the full SHA
    556aa31 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. go mod tidy/vendor 

    Signed-off-by: Owen Diehl <ow.diehl@gmail.com>
    @owen-d
    owen-d committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    90a82aa View commit details
    Browse the repository at this point in the history