Merge branch 'master' of https://github.com/apache/samza
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/ed196c7b Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/ed196c7b Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/ed196c7b Branch: refs/heads/master Commit: ed196c7b1f5b06d0d9d59aa04cfe035e7c892cea Parents: 429277b a528cc6 Author: Jagadish <jvenkatra...@linkedin.com> Authored: Thu Nov 1 15:38:32 2018 -0700 Committer: Jagadish <jvenkatra...@linkedin.com> Committed: Thu Nov 1 15:38:32 2018 -0700 ---------------------------------------------------------------------- .../samza/config/KafkaConsumerConfig.java | 14 + .../org/apache/samza/config/KafkaConfig.scala | 18 - .../samza/config/RegExTopicGenerator.scala | 4 +- .../samza/config_deprecated/KafkaConfig.scala | 400 +++++++++++++++++++ .../kafka_deprecated/KafkaSystemFactory.scala | 6 +- .../apache/samza/config/TestKafkaConfig.scala | 42 +- 6 files changed, 425 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
