Merge pull request #171 from RIA-pierre-borckmans/master

Fixed typos in the CDH4 distributions version codes.

Nothing important, but annoying when doing a copy/paste...

(cherry picked from commit d76f5203af1f714efea30106bef9c2a3a80fd56e)
Signed-off-by: Reynold Xin <rxin@apache.org>
Merge pull request #170 from liancheng/hadooprdd-doc-typo

Fixed a scaladoc typo in HadoopRDD.scala

(cherry picked from commit 5a4f483652c3dc0730d1c908a6a46e2f77d270e1)
Signed-off-by: Reynold Xin <rxin@apache.org>
Merge pull request #169 from kayousterhout/mesos_fix

Don't ignore spark.cores.max when using Mesos Coarse mode

totalCoresAcquired is decremented but never incremented, causing Spark to effectively ignore spark.cores.max in coarse grained Mesos mode.

(cherry picked from commit 1a4cfbea334c7b0dae287eab4c3131c8f4b8a992)
Signed-off-by: Reynold Xin <rxin@apache.org>