You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by ni...@apache.org on 2016/02/19 19:31:25 UTC
[7/7] 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/c5009629
Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/c5009629
Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/c5009629
Branch: refs/heads/samza-sql
Commit: c500962912041a70553cb39cf02d6faba23c6b60
Parents: fb4f12e 4bcf88f
Author: Yi Pan (Data Infrastructure) <ni...@gmail.com>
Authored: Wed Feb 17 09:49:30 2016 -0800
Committer: Yi Pan (Data Infrastructure) <ni...@gmail.com>
Committed: Wed Feb 17 09:49:30 2016 -0800
----------------------------------------------------------------------
build.gradle | 1 +
.../tutorials/versioned/deploy-samza-to-CDH.md | 10 +-
.../java/org/apache/samza/storage/kv/Entry.java | 46 ++++++
.../samza/storage/kv/KeyValueIterator.java | 26 +++
.../apache/samza/storage/kv/KeyValueStore.java | 163 +++++++++++++++++++
.../samza/config/ElasticsearchConfig.java | 2 +-
.../DefaultIndexRequestFactory.java | 2 +-
.../samza/storage/kv/RocksDbKeyValueStore.scala | 2 +-
.../storage/kv/TestRocksDbKeyValueStore.scala | 12 +-
.../java/org/apache/samza/storage/kv/Entry.java | 46 ------
.../samza/storage/kv/KeyValueIterator.java | 26 ---
.../apache/samza/storage/kv/KeyValueStore.java | 163 -------------------
.../job/yarn/AbstractContainerAllocator.java | 33 +++-
.../samza/job/yarn/ContainerAllocator.java | 40 ++---
.../samza/job/yarn/ContainerRequestState.java | 58 +++----
.../job/yarn/HostAwareContainerAllocator.java | 87 ++++------
16 files changed, 363 insertions(+), 354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza/blob/c5009629/build.gradle
----------------------------------------------------------------------