You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by cr...@apache.org on 2015/04/08 19:12:45 UTC
[3/3] samza git commit: Merge branch 'master' into samza-sql
Merge branch 'master' into samza-sql
Project: http://git-wip-us.apache.org/repos/asf/samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/434b1936
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/434b1936
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/434b1936
Branch: refs/heads/samza-sql
Commit: 434b1936c706d289e9382b3ddad4de3f2d416b4c
Parents: 1b66a91 9427c9e
Author: Chris Riccomini <cr...@apache.org>
Authored: Wed Apr 8 10:12:02 2015 -0700
Committer: Chris Riccomini <cr...@apache.org>
Committed: Wed Apr 8 10:12:02 2015 -0700
----------------------------------------------------------------------
.../versioned/jobs/configuration-table.html | 30 +++++++-----
.../org/apache/samza/config/TaskConfig.scala | 6 +++
.../org/apache/samza/container/RunLoop.scala | 48 +++++++++----------
.../apache/samza/container/SamzaContainer.scala | 7 ++-
.../org/apache/samza/job/local/ProcessJob.scala | 22 ++++-----
.../samza/job/local/ProcessJobFactory.scala | 49 ++++++++------------
.../apache/samza/container/TestRunLoop.scala | 34 --------------
.../apache/samza/job/local/TestProcessJob.scala | 18 ++++++-
8 files changed, 99 insertions(+), 115 deletions(-)
----------------------------------------------------------------------