Downgrade geoip2, exclude com.google.http-client.#2741
Merged
fjy merged 1 commit intoapache:masterfrom Mar 26, 2016
Merged
Conversation
Contributor
Author
|
@erikdubbelboer does this approach work for you? |
Reverts "Update com.maxmind.geoip2 to 2.6.0" and exclude the google http client from com.maxmind.geoip2. This should satisfy the original need from apache#2646 (wanting to run Druid along with an upgraded com.google.http-client) while preventing Jackson conflicts pointed out in apache#2717. Fixes apache#2717. This reverts commit 21b7572.
gianm
changed the title
| ).get()) { | ||
| // 404 is ok here, that means it was already deleted | ||
| if (!HttpStatusCodes.isSuccess(returnCode.get()) || HttpStatusCodes.STATUS_CODE_NOT_FOUND != returnCode.get()) { | ||
| if (!httpStatusIsSuccess(returnCode.get()) || !httpStatusIsNotFound(returnCode.get())) { |
Contributor
Author
There was a problem hiding this comment.
@drcrallen is this right? I think the || should be &&
Contributor
There was a problem hiding this comment.
Or is correct.
Normal logic is success only.
Here are 404 is also a "success"
Contributor
There was a problem hiding this comment.
Yeah, this is supposed to be any of 200 202 or 404 essentially. Looking into why unit tests didn't report weird stuff here
Contributor
There was a problem hiding this comment.
Thanks for the catch. Will have unit test fix in soon
Contributor
|
👍 |
1 similar comment
Member
|
👍 |
Contributor
|
Contributor
|
@gianm I'm on holiday at the moment so I haven't had time to test it yet. |
Contributor
|
@gianm I finally had time to test this, it works perfectly. |
Contributor
Author
|
@erikdubbelboer thanks, that's good to hear! |
erikdubbelboer
added a commit
to atomx/druid
that referenced
this pull request
Sep 11, 2016
Also excludes the correct artifacts from apache#2741
erikdubbelboer
added a commit
to erikdubbelboer/druid
that referenced
this pull request
Oct 2, 2016
Also excludes the correct artifacts from apache#2741
erikdubbelboer
added a commit
to erikdubbelboer/druid
that referenced
this pull request
Oct 9, 2016
Also excludes the correct artifacts from apache#2741
erikdubbelboer
added a commit
to erikdubbelboer/druid
that referenced
this pull request
Nov 16, 2016
Also excludes the correct artifacts from apache#2741
nishantmonu51
pushed a commit
that referenced
this pull request
Nov 16, 2016
Also excludes the correct artifacts from #2741
fundead
pushed a commit
to fundead/druid
that referenced
this pull request
Dec 7, 2016
Also excludes the correct artifacts from apache#2741
dgolitsyn
pushed a commit
to metamx/druid
that referenced
this pull request
Feb 14, 2017
Also excludes the correct artifacts from apache#2741
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts "Update com.maxmind.geoip2 to 2.6.0" and exclude the google http client
from com.maxmind.geoip2. This should satisfy the original need from #2646 (wanting
to run Druid along with an upgraded com.google.http-client) while preventing
Jackson conflicts pointed out in #2717.
This reverts commit 21b7572.
Fixes #2717.