Fix merge conflicts in coarse multuple executors#6

Open

hermansc wants to merge 5 commits intotnachen:coarse_multiple_executorsfrom

hermansc:master

Commits on Sep 2, 2015

[SPARK-5095] Support capping cores and launch mulitple executors in coarse grain mode.
tnachen
committed
Add documentation
tnachen
committed
updates the test to comply to the updated TaskDescription.

Gerard Maas
authored and
tnachen
committed
Fix review comments.
tnachen
committed

Commits on Oct 24, 2015

Fix merge conflicts in tnacen coarse multiple executors
Herman Schistad
committed