KAFKA-1215: Merge master and fix conflicts #5
Conversation
This file contains 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
This fix was suggested by Maciek Makowski, who also reported the problem. Author: Ismael Juma <[email protected]> Reviewers: Guozhang Wang <[email protected]> Closes apache#1029 from ijuma/KAFKA-3047-log-append-can-corrupt-the-log
Author: Manikumar reddy O <[email protected]> Reviewers: Ismael Juma <[email protected]>, Sriharsha Chintalapani <[email protected]> Closes apache#1054 from omkreddy/KAFKA-2551
guozhangwang Author: Yasuhiro Matsuda <[email protected]> Reviewers: Guozhang Wang <[email protected]> Closes apache#1062 from ymatsuda/k3395
…d final for object used in sychronization guozhangwang Very minor cleanup. Author: Liquan Pei <[email protected]> Reviewers: Guozhang Wang <[email protected]> Closes apache#1063 from Ishiihara/minor-cleanup
Author: Jiangjie Qin <[email protected]> Reviewers: Gwen Shapira Closes apache#1049 from becketqin/KAFKA-3373
…ompiler settings * Fix and suppress number of unchecked warnings (except for Kafka Streams) * Add `SafeVarargs` annotation to fix warnings * Suppress unfixable deprecation warnings * Replace deprecated by non-deprecated usage where possible * Avoid reflective calls via structural types in Scala * Tweak compiler settings for scalac and javac Once we drop Java 7 and Scala 2.10, we can tweak the compiler settings further so that they warn us about more things. Author: Ismael Juma <[email protected]> Reviewers: Grant Henke, Gwen Shapira, Guozhang Wang Closes apache#1042 from ijuma/kafka-3375-suppress-depreccated-tweak-compiler
…expired batches in recordAccumulator Added topic-partition information to the exception message on batch expiry in RecordAccumulator Author: MayureshGharat <[email protected]> Reviewers: Gwen Shapira, Lin Dong, Ismael Juma Closes apache#695 from MayureshGharat/kafka-3013
* apache/trunk: KAFKA-3013: Display the topic-partition in the exception message for expired batches in recordAccumulator KAFKA-3375; Suppress deprecated warnings where reasonable and tweak compiler settings KAFKA-3373; add 'log' prefix to configurations in KIP-31/32 MINOR: Remove unused method, redundant in interface definition and add final for object used in sychronization KAFKA-3395: prefix job id to internal topic names KAFKA-2551; Update Unclean leader election docs KAFKA-3047: Explicit offset assignment in Log.append can corrupt the log
|
@allenxwang, I merged master and fixed a minor conflict. |
allenxwang
pushed a commit
that referenced
this pull request
Mar 15, 2016
KAFKA-1215: Merge master and fix conflicts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.