Merge branch 'master' into NewConsumer
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/34ae8ba2 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/34ae8ba2 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/34ae8ba2 Branch: refs/heads/NewKafkaSystemConsumer Commit: 34ae8ba2dd18c7d7af46464033b330a35966db3f Parents: c0ea25c 7f7b559 Author: Boris S <[email protected]> Authored: Wed Aug 29 10:52:37 2018 -0700 Committer: Boris S <[email protected]> Committed: Wed Aug 29 10:52:37 2018 -0700 ---------------------------------------------------------------------- .../samza/execution/ExecutionPlanner.java | 20 +++++--- .../runtime/AbstractApplicationRunner.java | 20 +++++--- .../samza/runtime/LocalApplicationRunner.java | 41 ++++++++-------- .../samza/runtime/RemoteApplicationRunner.java | 36 +++++++------- .../org/apache/samza/config/MetricsConfig.scala | 11 +++-- .../diagnostics/DiagnosticsExceptionEvent.java | 6 +-- .../scala/org/apache/samza/job/JobRunner.scala | 2 +- .../reporter/MetricsSnapshotReporter.scala | 35 +++++++------- .../MetricsSnapshotReporterFactory.scala | 6 +-- .../runtime/TestLocalApplicationRunner.java | 50 ++++++++++++-------- 10 files changed, 129 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
