Fix start-slave not passing instance number to spark-daemon.
fix block manager UI display issue when enable spark.cleaner.ttl
Fix schedulingAlgorithm bugs for unit test
Sometime Maven build runs out of PermGen space.
Bump akka and blockmanager timeouts to 60 seconds
Merge pull request #639 from pwendell/timeout-update

Bump akka and blockmanager timeouts to 60 seconds
Fixing bug in BlockManager timeout
Merge pull request #640 from pwendell/timeout-update

Fixing bug in BlockManager timeout
Merge pull request #634 from xiajunluan/master

[Spark-753] Fix ClusterSchedulSuite unit test failed
Small code style fix to SchedulingAlgorithm.scala
Merge pull request #631 from jerryshao/master

Fix block manager UI display issue when enable spark.cleaner.ttl
Small formatting and style fixes
Merge pull request #629 from c0s/master

Sometime Maven build runs out of PermGen space.
Merge pull request #625 from stephenh/fix-start-slave

Fix start-slave not passing instance number to spark-daemon.
Revert "Fix start-slave not passing instance number to spark-daemon."

This reverts commit a674d67c0aebb940e3b816e2307206115baec175.
Merge branch 'master' of git://github.com/mesos/spark into netty-dbg
Merge branch 'netty-dbg' of github.com:shivaram/spark into netty-dbg