kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jun...@apache.org
Subject [5/5] git commit: Merge remote branch 'origin/0.8' into trunk
Date Fri, 04 Jan 2013 21:43:53 GMT
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 <junrao@gmail.com>
Authored: Fri Jan 4 13:42:27 2013 -0800
Committer: Jun Rao <junrao@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
----------------------------------------------------------------------


Mime
View raw message