Merge branch 'master' into wip-scala-2.10
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/5618af68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/5618af68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/5618af68 Branch: refs/heads/master Commit: 5618af6803ab21ffc30f6d736a25ea690c03b06c Parents: 1bc83ca 743a31a Author: Prashant Sharma <[email protected]> Authored: Fri Nov 29 13:41:21 2013 +0530 Committer: Prashant Sharma <[email protected]> Committed: Fri Nov 29 13:41:21 2013 +0530 ---------------------------------------------------------------------- .../scala/org/apache/spark/broadcast/HttpBroadcast.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
