Skip to content

Conversation

@cben
Copy link
Collaborator

@cben cben commented Jun 14, 2020

Forked from master to cherry-pick compatible changes #446 without waiting for 5.0.
Want to merge back to minimize divergence (and the changelog will be relevant for 5.0 too)

cben added 8 commits June 14, 2020 17:42
Document watch and upcoming changes
fix Ruby 2.7 deprecation warnings
bump recursive-open-struct for Ruby 2.7 compatibility
Add userinfo.email to default scopes in gcp auth provider
These changes were backported to v4.y branch
(all from master except #355).
Planning to also merge this to master.
@cben
Copy link
Collaborator Author

cben commented Jun 14, 2020

Diff on Github is misleading, specifically the README changes it shows are already on master (#436), it's confused by cherry-picks.
Confirmed locally (git fetch origin pull/447/merge; git checkout FETCH_HEAD) that git merges the cherry-picks cleanly, and the only differences are CHANGELOG.md, RELEASING.md, lib/kubeclient/version.rb, as expected.

@cben cben merged commit 287b985 into master Jun 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants