Use remove-alertmanager-2.11 branch of Prometheus#1593
Closed
codesome wants to merge 1 commit intocortexproject:masterfrom
Closed
Use remove-alertmanager-2.11 branch of Prometheus#1593codesome wants to merge 1 commit intocortexproject:masterfrom
codesome wants to merge 1 commit intocortexproject:masterfrom
Conversation
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Contributor
|
Why do we need 2 branches?
…On Tue, Aug 20, 2019, 7:57 PM Ganesh Vernekar ***@***.***> wrote:
I updated remove-alertmanager branch of Prometheus for some other PR
which cortex is using currently. This broke the vendoring.
I have created another branch remove-alertmanager-2.11 with base version
of Prometheus suffixed so that the same mistake is not repeated.
(Refer #1510 (comment)
<#1510 (comment)>
for the previous Prometheus vendoring)
------------------------------
You can view, comment on, or merge this pull request online at:
#1593
Commit Summary
- Use remove-alertmanager-2.11 branch of Prometheus
File Changes
- *M* go.mod
<https://github.com/cortexproject/cortex/pull/1593/files#diff-0> (2)
- *M* go.sum
<https://github.com/cortexproject/cortex/pull/1593/files#diff-1> (4)
- *M* vendor/modules.txt
<https://github.com/cortexproject/cortex/pull/1593/files#diff-2> (2)
Patch Links:
- https://github.com/cortexproject/cortex/pull/1593.patch
- https://github.com/cortexproject/cortex/pull/1593.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#1593?email_source=notifications&email_token=ABYDOH67Z7V2ZBOL6WG2IELQFP5L3A5CNFSM4INXUF22YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HGIM4KQ>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABYDOHZWA76Q64T4BLULGS3QFP5L3ANCNFSM4INXUF2Q>
.
|
Contributor
Author
|
Forgot to mention: now cortex would only use |
Contributor
Author
|
Restored |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I updated
remove-alertmanagerbranch of Prometheus for some other PR which cortex is using currently. This broke the vendoring.I have created another branch
remove-alertmanager-2.11with base version of Prometheus suffixed so that the same mistake is not repeated.(Refer #1510 (comment) for the previous Prometheus vendoring)