Repository: spark Updated Branches: refs/heads/master f65c1f38e -> 369aad6f9
Removed accidentally checked in comment It looks like this comment was added a while ago by @mridulm as part of a merge and was accidentally checked in. We should remove it. Author: Kay Ousterhout <kayousterh...@gmail.com> Closes #61 from kayousterhout/remove_comment and squashes the following commits: 0b2b3f2 [Kay Ousterhout] Removed accidentally checked in comment Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/369aad6f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/369aad6f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/369aad6f Branch: refs/heads/master Commit: 369aad6f9e25d49b0d32f37e5069b6d4e41a59d9 Parents: f65c1f3 Author: Kay Ousterhout <kayousterh...@gmail.com> Authored: Mon Mar 3 14:39:49 2014 -0800 Committer: Reynold Xin <r...@apache.org> Committed: Mon Mar 3 14:39:49 2014 -0800 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/network/ConnectionManager.scala | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/369aad6f/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala index 3dd82be..a7f20f8 100644 --- a/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala +++ b/core/src/main/scala/org/apache/spark/network/ConnectionManager.scala @@ -550,9 +550,6 @@ private[spark] class ConnectionManager(port: Int, conf: SparkConf) extends Loggi newConnection } - // I removed the lookupKey stuff as part of merge ... should I re-add it ? We did not find it - // useful in our test-env ... If we do re-add it, we should consistently use it everywhere I - // guess ? val connection = connectionsById.getOrElseUpdate(connectionManagerId, startNewConnection()) message.senderAddress = id.toSocketAddress() logDebug("Sending [" + message + "] to [" + connectionManagerId + "]")