Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/kafka into trunk
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/2cda5d1f Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/2cda5d1f Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/2cda5d1f Branch: refs/heads/trunk Commit: 2cda5d1fca90e93ecfd44665fe32033ddce99c52 Parents: c98bdd3 3b470f5 Author: Jun Rao <[email protected]> Authored: Mon Jul 8 15:49:53 2013 -0700 Committer: Jun Rao <[email protected]> Committed: Mon Jul 8 15:49:53 2013 -0700 ---------------------------------------------------------------------- core/src/main/scala/kafka/consumer/ConsoleConsumer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/2cda5d1f/core/src/main/scala/kafka/consumer/ConsoleConsumer.scala ----------------------------------------------------------------------
