You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by jg...@apache.org on 2014/04/09 07:51:07 UTC
[1/2] git commit: SAMZA-231: Remove dead code from
SamzaAppMasterTaskManager::startContainer()
Repository: incubator-samza
Updated Branches:
refs/heads/master b3b485cce -> 80bf78204
SAMZA-231: Remove dead code from SamzaAppMasterTaskManager::startContainer()
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/73fea8d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/73fea8d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/73fea8d6
Branch: refs/heads/master
Commit: 73fea8d630ff8bc2c16ddac2f3a4acf4a61fdb54
Parents: b3b485c
Author: Yan Fang <yanfang724 at gmail dot com>
Authored: Tue Apr 8 22:41:45 2014 -0700
Committer: Jakob Homan <jg...@gmail.com>
Committed: Tue Apr 8 22:41:45 2014 -0700
----------------------------------------------------------------------
.../org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/73fea8d6/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala
----------------------------------------------------------------------
diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala
index 418a981..58b2d30 100644
--- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala
+++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala
@@ -265,9 +265,6 @@ class SamzaAppMasterTaskManager(clock: () => Long, config: Config, state: SamzaA
protected def startContainer(packagePath: Path, container: Container, env: Map[String, String], cmds: String*) {
info("starting container %s %s %s %s" format (packagePath, container, env, cmds))
- // connect to container manager (based on similar code in the ContainerLauncher in Hadoop MapReduce)
- val contToken = container.getContainerToken
- val address = container.getNodeId.getHost + ":" + container.getNodeId.getPort
// set the local package so that the containers and app master are provisioned with it
val packageResource = Records.newRecord(classOf[LocalResource])
[2/2] git commit: SAMZA-231: TestKafkaSystemConsumer needs ASF header.
Posted by jg...@apache.org.
SAMZA-231: TestKafkaSystemConsumer needs ASF header.
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/80bf7820
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/80bf7820
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/80bf7820
Branch: refs/heads/master
Commit: 80bf782049bf2bfb6fb431cf83ee77da14701c04
Parents: 73fea8d
Author: Yan Fang <yanfang724 at gmail dot com>
Authored: Tue Apr 8 22:43:56 2014 -0700
Committer: Jakob Homan <jg...@gmail.com>
Committed: Tue Apr 8 22:43:56 2014 -0700
----------------------------------------------------------------------
.../system/kafka/TestKafkaSystemConsumer.scala | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/80bf7820/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala
----------------------------------------------------------------------
diff --git a/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala
index d6fb959..93766cd 100644
--- a/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala
+++ b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestKafkaSystemConsumer.scala
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.samza.system.kafka
import org.junit.Test