Merge remote branch 'upstream/master'

.gitignore

README.md

assembly/pom.xml

bin/pyspark

bin/run-example

bin/spark-class

conf/spark-env.sh.template

.../main/java/org/apache/spark/network/netty/FileClient.java

...che/spark/network/netty/FileClientChannelInitializer.java

.../main/java/org/apache/spark/network/netty/FileServer.java

...che/spark/network/netty/FileServerChannelInitializer.java

...ava/org/apache/spark/network/netty/FileServerHandler.java

...ain/java/org/apache/spark/network/netty/PathResolver.java

...main/resources/org/apache/spark/log4j-defaults.properties

core/src/main/scala/org/apache/spark/Logging.scala

core/src/main/scala/org/apache/spark/MapOutputTracker.scala

core/src/main/scala/org/apache/spark/SparkConf.scala

core/src/main/scala/org/apache/spark/SparkContext.scala

core/src/main/scala/org/apache/spark/SparkEnv.scala

...cala/org/apache/spark/deploy/ApplicationDescription.scala