GitHub user futtre opened a pull request: https://github.com/apache/kafka/pull/35
Trunk You can merge this pull request into a Git repository by running: $ git pull https://github.com/apache/kafka trunk Alternatively you can review and apply these changes as the patch at: https://github.com/apache/kafka/pull/35.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #35 ---- commit 5de68ef4aef7812fd9f2d5e4fb6158bf753658e3 Author: Sriram Subramanian <sriram....@gmail.com> Date: 2014-02-24T09:50:02Z Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk Conflicts: core/src/main/scala/kafka/controller/KafkaController.scala commit 3955915a5f8a0daa7b96be69a87b3fbd013c9501 Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-02-24T22:44:32Z KAFKA-1279 Socket server should close all connections when it is shutdown. commit 5b80758b57d8063b8a8124562cc5c83854a99e00 Author: Sriram Subramanian <sriram....@gmail.com> Date: 2014-02-25T08:22:04Z Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/kafka into trunk commit 00afb619cb1f2aaca0ddc785ab1d649428f9c93e Author: Sriram Subramanian <sriram....@gmail.com> Date: 2014-02-25T08:26:14Z Check delete state of topic commit edbed2823fc3e4948bb56ec3bee02fe4ad1bbdca Author: Nathan Brown <nbrown...@gmail.com> Date: 2014-02-25T17:37:15Z kafka-1278; More flexible helper scripts; patched by Nathan Brown; reviewed by Jun Rao commit 57be6c81a748a30e583037ddc70d2eec9acc7832 Author: Jun Rao <jun...@gmail.com> Date: 2014-02-26T02:09:59Z kafka-1280; exclude kafka-clients jar from dependant-libs dir; patched by Jun Rao; reviewed by Neha Narkhede commit 5e2a9a560d847bd0cf364d86bd6784f70d99c71a Author: Guozhang Wang <guw...@linkedin.com> Date: 2014-02-27T18:50:15Z KAFKA-1260 Integration Test for New Producer Part II: Broker Failure Handling; reviewed by Jay Kreps, Neha Narkhede and Jun Rao commit eb6da57492caad7a6b71692ad184a95c89035b67 Author: Guozhang Wang <guw...@linkedin.com> Date: 2014-02-27T22:15:41Z kafka-1212; System test exception handling does not stop background producer threads; patched by Guozhang Wang; reviewed by Neha Narkhede, Joel Koshy, and Jun Rao commit a810b8ecbe66f36f8ef58a440d439a54762b3d9c Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-02-27T22:25:02Z TRIVIAL: Fix failing producer integration tests. commit f1a53b972eb1f8e75db54d3272d9eb7c398e238a Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-02-21T04:17:01Z KAFKA-1250 Add logging to new producer. commit 8cdb234ad81ec324f15c9c1f8e484861926076f9 Author: Rajasekar Elango <e.rajase...@gmail.com> Date: 2014-02-28T16:02:42Z kafka-1041; Number of file handles increases indefinitely in producer if broker host is unresolvable; patched by Rajasekar Elango; reviewed by Jun Rao commit 220cc842a6e866806e3f53c394b5547fe7c44b3e Author: Jun Rao <jun...@gmail.com> Date: 2014-02-28T21:53:37Z kafka-1285; enable log4j in unit test; patched by Jun Rao; reviewed by Neha Narkhede commit 40c6555eb0d0db25d6bd06c5eb4040246805c79f Author: Jun Rao <jun...@gmail.com> Date: 2014-03-03T17:35:21Z kafka-1287; enable log4j in command line tools using the new producer; patched by Jun Rao; reviewed by Guozhang Wang and Neha Narkhede commit 77118a935ee28da80c67d4050f41a1e7e838ebaa Author: Joe Stein <joe.st...@stealth.ly> Date: 2014-03-04T20:30:59Z KAFKA-1289 Misc. nitpicks in log cleaner for new 0.8.1 features patch by Jay Kreps, reviewed by Sriram Subramanian and Jun Rao commit 153ac8aa604014351e6958dce5d479e4875031fa Author: Joe Stein <joe.st...@stealth.ly> Date: 2014-03-04T20:49:12Z KAFKA-1288 add enclosing dir in release tar gz patch by Jun Rao, reviewed by Neha Narkhede commit 5ba48348b3abb8f84fda0798d992ff2e0a04051d Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-03-05T04:05:51Z KAFKA-1286 Retry can block. Patch from Guozhang, reviewed by jay. commit 2404191be9f4323fc6144a8f56ae36f794d50da6 Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-03-05T21:32:08Z KAFKA-1286 Follow-up comment from Jun: Change the backoff default time configuration. commit 4524f384dc041f33297b47b181be6b59061577b4 Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-03-05T22:35:07Z KAFKA-1286: Trivial fix up: Use || instead of |. commit 6319f26e6f47350f1e7926dea153ed848f464d2e Author: Jay Kreps <jay.kr...@gmail.com> Date: 2014-03-06T16:26:12Z TRIVIAL: Fix spurious logging in console consumer. commit c3520fe7e0e50f0eeb4f82ad1ed961bdd39440fc Author: Martin Kleppmann <mar...@rapportive.com> Date: 2014-03-06T17:34:37Z kafka-server-stop.sh doesn't stop broker; reviewed by Neha Narkhede commit 74c54c7eeb236cbf66710751165ea9f632cf3f52 Author: Neha Narkhede <neha.narkh...@gmail.com> Date: 2014-03-07T02:08:55Z KAFKA-1281 add the new producer to existing tools; reviewed by Jun Rao and Guozhang Wang commit c765d7bd4e30e0b952fc4bc00d142f7939b498a6 Author: Jun Rao <jun...@gmail.com> Date: 2014-03-07T03:06:25Z kafka-1240; Add ability to existing system tests to use the new producer client; patched by Jun Rao; reviewed by Neha Narkhede commit c124bbbb6c3e2152915411e1c3b00fca67634eed Author: Jun Rao <jun...@gmail.com> Date: 2014-03-12T03:56:32Z kafka-1301; system testcase_0206 fails using the new producer; patched by Jun Rao; reviewed by Jay Kreps commit 84a3a9a3d9a5f1c4936dfb9d65b4bf0cd3b445d6 Author: Jun Rao <jun...@gmail.com> Date: 2014-03-13T21:25:37Z kafka-1302; cleanup logging in new producer; reviewed by Jay Kreps, Guozhang Wang and Neha Narkhede commit a670537aa33732b15b56644d8ccc1681e16395f5 Author: Joel Koshy <jjko...@gmail.com> Date: 2014-03-14T22:14:33Z KAFKA-1012; Consumer offset management in Kafka; patched by Tejas Patil and Joel Koshy; feedback and reviews from Neha Narkhede, Jun Rao, Guozhang Wang, Sriram Subramanian, Joe Stein, Chris Riccomini commit 616086b909252eeee2cb05f379659a2de2c7bd83 Author: Andrew Olson <andrew.ol...@cerner.com> Date: 2014-03-18T01:39:57Z KAFKA-1028 per topic configuration of preference for consistency over availability; reviewed by Neha Narkhede and Jay Kreps commit 53e4061b2b0170ee35939ba1d6462e6c6f37ccea Author: Neha Narkhede <neha.narkh...@gmail.com> Date: 2014-03-18T01:46:30Z KAFKA-1028 follow up: New test UncleanLeaderElectionTest commit 423d9d5af9481b782c7655dc2410e61e1b48a0bb Author: Joel Koshy <jjko...@gmail.com> Date: 2014-03-18T17:38:03Z KAFKA-1309; Fix cross-compilation issue (due to use of deprecated JavaConversions API in javaapi.OffsetCommitRequest; reviewed by Neha Narkhede commit cc859dcca791dc8e1e6eeabe8b88387a11241b24 Author: Jun Rao <jun...@gmail.com> Date: 2014-03-18T17:51:50Z kafka-1307; potential socket leak in new producer and clean up; reviewed by Jay Kreps, Guozhang Wang and Neha Narkhede commit 74e22092519270428c067a5209ec3028e0745bea Author: Jun Rao <jun...@gmail.com> Date: 2014-03-18T17:55:19Z kafka-1304; unregistered mbean exception in new producer; reviewed by Jay Kreps ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---