You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2013/01/04 22:43:53 UTC
[5/5] git commit: Merge remote branch 'origin/0.8' into trunk
Updated Branches:
refs/heads/trunk 32dae955d -> a39c34a2d
Merge remote branch 'origin/0.8' into trunk
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/a39c34a2
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/a39c34a2
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/a39c34a2
Branch: refs/heads/trunk
Commit: a39c34a2d138b3bdc5af70f4888982b02dea0742
Parents: 32dae95 2f4bfc6
Author: Jun Rao <ju...@gmail.com>
Authored: Fri Jan 4 13:42:27 2013 -0800
Committer: Jun Rao <ju...@gmail.com>
Committed: Fri Jan 4 13:42:27 2013 -0800
----------------------------------------------------------------------
config/server.properties | 11 +-
.../main/scala/kafka/admin/ShutdownBroker.scala | 33 +++---
core/src/main/scala/kafka/api/ApiUtils.scala | 13 ++-
.../main/scala/kafka/network/SocketServer.scala | 40 ++++++--
.../kafka/server/HighwaterMarkCheckpoint.scala | 14 +--
core/src/main/scala/kafka/server/KafkaConfig.scala | 6 +-
core/src/main/scala/kafka/server/KafkaServer.scala | 1 +
.../main/scala/kafka/server/KafkaZooKeeper.scala | 11 ++-
core/src/main/scala/kafka/utils/ZkUtils.scala | 6 +-
.../test/scala/unit/kafka/api/ApiUtilsTest.scala | 84 +++++++++++++++
.../unit/kafka/network/SocketServerTest.scala | 1 +
.../test/scala/unit/kafka/utils/TestUtils.scala | 2 +-
12 files changed, 167 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/a39c34a2/core/src/main/scala/kafka/server/KafkaConfig.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/a39c34a2/core/src/main/scala/kafka/server/KafkaServer.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/a39c34a2/core/src/test/scala/unit/kafka/utils/TestUtils.scala
----------------------------------------------------------------------