Skip to content

Bump to v2.7.1 #23

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.

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

Merged
merged 95 commits into from
Feb 4, 2019

Conversation

simonpasquier
Copy link

Branch comparison between the upstream v2.7.1 tag and this PR:

prometheus/prometheus@v2.7.1...simonpasquier:aos-bump-v2.7.1

This includes prometheus#5163

cc @brancz

tariqibrahim and others added 30 commits November 28, 2018 21:13
Useful when multiple (tagged) addresses for a node are exposed on the catalog API
Ref. https://www.consul.io/api/catalog.html#taggedaddresses

Signed-off-by: Samuel Alfageme <[email protected]>
…om/prometheus/prometheus/notifier', changed to 'notifierManager'. (prometheus#4947)

Signed-off-by: aixeshunter <[email protected]>
…of using a slice) for BufferedSeriesIterator, to reduce the variance of benchmark results due to memory pressure. (prometheus#4847)

Signed-off-by: Alin Sinpalean <[email protected]>
…les falling outside of the new delta from the underlying sampleRing, when ReduceDelta is called. (prometheus#4849)

Signed-off-by: Alin Sinpalean <[email protected]>
Adapted top dir relabel to use pkg relabel structs.

Removal of this in a separate tracked here: prometheus#3647

Signed-off-by: Bartek Plotka <[email protected]>
Signed-off-by: tariqibrahim <[email protected]>
Signed-off-by: tariqibrahim <[email protected]>
Signed-off-by: tariqibrahim <[email protected]>
Signed-off-by: tariqibrahim <[email protected]>
Adds checks for current OS and arch to determine whether the '-race' option
should be used with go test

Signed-off-by: Paul Gier <[email protected]>
…ackground() (prometheus#5024)

* vendor update
* discovery/gce: oauth2.NoContext is deprecated, replace with context.Background()

Signed-off-by: Erik Hollensbe <[email protected]>
simonpasquier and others added 16 commits January 18, 2019 09:55
* update tsdb to v0.4.0

Signed-off-by: Krasi Georgiev <[email protected]>

* remove unused struct field

Signed-off-by: Krasi Georgiev <[email protected]>
* Add flag for size based retention

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Deprecate the old retention flag for a new one.

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Add ability to take a suffix for size flag

Signed-off-by: Goutham Veeramachaneni <[email protected]>

* Address feedback

Signed-off-by: Goutham Veeramachaneni <[email protected]>
Also sanitise the max block duration to max a month.

Signed-off-by: Goutham Veeramachaneni <[email protected]>
Signed-off-by: Goutham Veeramachaneni <[email protected]>
Signed-off-by: Goutham Veeramachaneni <[email protected]>
Signed-off-by: Goutham Veeramachaneni <[email protected]>
Signed-off-by: Goutham Veeramachaneni <[email protected]>
Signed-off-by: Goutham Veeramachaneni <[email protected]>
v2.7.1

Signed-off-by: Simon Pasquier <[email protected]>
Signed-off-by: Simon Pasquier <[email protected]>
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 31, 2019
@simonpasquier
Copy link
Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2019
Copy link

@pgier pgier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pgier, simonpasquier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [pgier,simonpasquier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@brancz
Copy link

brancz commented Feb 4, 2019

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 4, 2019
@openshift-merge-robot openshift-merge-robot merged commit 6e5fb5d into openshift:master Feb 4, 2019
@simonpasquier simonpasquier deleted the aos-bump-v2.7.1 branch February 4, 2019 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.