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

Merge v2-master into master #4044

Merged
merged 10 commits into from
Dec 4, 2019
Merged

Merge v2-master into master #4044

merged 10 commits into from
Dec 4, 2019

Conversation

richard-cox
Copy link
Contributor

No description provided.

nwmac and others added 10 commits October 31, 2019 11:19
@nwmac
Follow redirect - needed for repo move
c6a507e
@richard-cox @nwmac
Update metric used for cells (#4009)
173df4b 
- `firehose_value_metric_rep_unhealthy_cell` deprecated, now use `firehose_value_metric_rep_garden_health_check_failed`
- Try new metric first and fall back on old
@richard-cox @nwmac
Fix incorrect SSO behaviour following 2.4.0 --> 2.6.0 upgrade (#4015)
7a2bfc6 
- affects db migration of console config table to new config table
- fixes #4013
@nwmac
2.6.1 Release preparation
110b721
@richard-cox
Merge pull request #4020 from cloudfoundry/release-261
b9e8bef 
Release 2.6.1 Release Notes and Version bump
@nwmac
Ingress fix (#4024)
d499609 
* Fixes ingress and kube 1.16 version issue

* Update Changelog

* More test

* Fix ingress tests
@gberche-orange @nwmac
Mention STRATOS_BP_DEBUG to troubleshoot staging (#4039)
b38a8dd
@richard-cox
Merge pull request #4041 from cloudfoundry/v2-buildpack-verbose-logging
70238bb 
 Mention STRATOS_BP_DEBUG to troubleshoot staging (v2-master)
@richard-cox
Merge remote-tracking branch 'origin/v2-master'
c0e2d65
@richard-cox
Fix following merge
2e7fd0b
@richard-cox richard-cox self-assigned this Dec 4, 2019
nwmac
nwmac approved these changes Dec 4, 2019
View reviewed changes
Copy link
Contributor

@nwmac nwmac left a comment

Choose a reason for hiding this comment

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

LGTM

@nwmac nwmac merged commit 9c44228 into master Dec 4, 2019
@nwmac nwmac deleted the merge-v2-master branch December 4, 2019 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nwmac nwmac nwmac approved these changes

Assignees

@richard-cox richard-cox

Labels
ready for review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@richard-cox @nwmac @gberche-orange