Repository: spark Updated Branches: refs/heads/branch-1.0 d28c05887 -> b65def770
delete no use var Author: wangfei <wangfei_he...@126.com> Closes #613 from scwf/masterIndex and squashes the following commits: 1463056 [wangfei] delete no use var: masterIndex (cherry picked from commit 4bf24f7897e1c67ca5f96dec05480e571f05ee1d) Signed-off-by: Patrick Wendell <pwend...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b65def77 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b65def77 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b65def77 Branch: refs/heads/branch-1.0 Commit: b65def7703e555a6d037da8b56dd71995d1de052 Parents: d28c058 Author: wangfei <wangfei_he...@126.com> Authored: Fri May 2 21:34:54 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Fri May 2 21:35:33 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b65def77/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala index 195da81..cd6bd2c 100755 --- a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala @@ -71,8 +71,6 @@ private[spark] class Worker( // TTL for app folders/data; after TTL expires it will be cleaned up val APP_DATA_RETENTION_SECS = conf.getLong("spark.worker.cleanup.appDataTtl", 7 * 24 * 3600) - // Index into masterUrls that we're currently trying to register with. - var masterIndex = 0 val masterLock: Object = new Object() var master: ActorSelection = null
