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.

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

adapt tests for provide-api-key annotation upstream #433

Merged
merged 2 commits into from
Apr 11, 2019
Merged

adapt tests for provide-api-key annotation upstream #433

merged 2 commits into from
Apr 11, 2019

Conversation

matthiaskubik
Copy link
Contributor

@rabbah
Copy link
Member

rabbah commented Apr 10, 2019

This PR should be merged without squashing independent commits in case we need to roll back. Ideally orthogonal changes are in different PRs.

Edit: the first commit already conflates the gradle bump and the test updates. @matthiaskubik could you please re-stage the patches to separate the two changes into individual commits.

@rabbah
Copy link
Member

rabbah commented Apr 10, 2019

@matthiaskubik I'm going to bump the gradle version to 4.10.2 in this PR #395. This PR then will address just the test changes. Sorry for the confusion. I'm trying to reduce the work for you.

@rabbah rabbah changed the title bumped gradle version and retrofit incubator-openwhisk/pull/4423 adapt tests for provide-api-key annotation upstream Apr 10, 2019
@rabbah
Copy link
Member

rabbah commented Apr 10, 2019

@matthiaskubik i rebased your PR to master to pick up the gradle bump and retitled your PR accordingly. Thanks for the contribution and fixing the tests.

@rabbah rabbah self-assigned this Apr 10, 2019
@rabbah rabbah merged commit 8861d4b into apache:master Apr 11, 2019
@rabbah
Copy link
Member

rabbah commented Apr 11, 2019

Thanks @matthiaskubik for the contribution.

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