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

Update OkHttp version from RC to 3.0.1 #917

Merged
merged 1 commit into from
Jan 22, 2016
Merged

Update OkHttp version from RC to 3.0.1 #917

merged 1 commit into from
Jan 22, 2016

Conversation

frindly
Copy link

@frindly frindly commented Jan 22, 2016

Updating to newest ok http version

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed, please reply here (e.g. I signed it!) and we'll verify. Thanks.


  • If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
  • If you signed the CLA as a corporation, please let us know the company's name.

@frindly
Copy link
Author

frindly commented Jan 22, 2016

I signed it!

@sjudd
Copy link
Collaborator

sjudd commented Jan 22, 2016

Thanks, do you mind squashing your commits?

@TWiStErRob TWiStErRob added this to the 3.7.0 milestone Jan 22, 2016
@TWiStErRob TWiStErRob changed the title 3.0 Update OkHttp version from RC to 3.0.1 Jan 22, 2016
cleans up Memory leak, because raw data was not released
@frindly
Copy link
Author

frindly commented Jan 22, 2016

squashed

@@ -352,6 +352,7 @@ public void clear() {
bitmapProvider.release(previousImage);
}
previousImage = null;
rawData = null;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Merge error maybe?

Copy link
Collaborator

Choose a reason for hiding this comment

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

His branch is 1 PR behind, should the merge handle this? He's also using the same 3.0 branch as a feature branch.
Though it's probably better if @frindly tries to rebase.

@sjudd
Copy link
Collaborator

sjudd commented Jan 22, 2016

Ah yeah, I think this will be fine. I'll try merging and we will see :).

sjudd added a commit that referenced this pull request Jan 22, 2016
Update OkHttp version from RC to 3.0.1
@sjudd sjudd merged commit 24f395b into bumptech:3.0 Jan 22, 2016
@sjudd
Copy link
Collaborator

sjudd commented Jan 22, 2016

Yup worked, thanks!

@TWiStErRob
Copy link
Collaborator

Yeah, your merge "commit" is showing the correct diff, but his single commit shows the same diff with the extra line added. So it kind-of worked :) The only weird thing I don't like is the Blame shows his commit for that line and not the original one. So it's worth cleaning up the commits properly before accepting the PR to not confuse the VCS history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants