diff options
| author | nravi <nravi@c1704.halxg.cloudera.com> | 2014-06-19 17:11:06 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-06-19 17:11:15 -0700 |
| commit | 46660cca036a683b47b5ff5cac63910bc53f20fa (patch) | |
| tree | f93dafe32fca3044e939532309bef3607923335e /sql/catalyst | |
| parent | 58d06846f06726a9a6ce10995fe71155eae880bf (diff) | |
| download | spark-46660cca036a683b47b5ff5cac63910bc53f20fa.tar.gz spark-46660cca036a683b47b5ff5cac63910bc53f20fa.tar.bz2 spark-46660cca036a683b47b5ff5cac63910bc53f20fa.zip | |
[SPARK-2151] Recognize memory format for spark-submit
int format expected for input memory parameter when spark-submit is invoked in standalone cluster mode. Make it consistent with rest of Spark.
Author: nravi <nravi@c1704.halxg.cloudera.com>
Closes #1095 from nishkamravi2/master and squashes the following commits:
2b630f9 [nravi] Accept memory input as "30g", "512M" instead of an int value, to be consistent with rest of Spark
3bf8fad [nravi] Merge branch 'master' of https://github.com/apache/spark
5423a03 [nravi] Merge branch 'master' of https://github.com/apache/spark
eb663ca [nravi] Merge branch 'master' of https://github.com/apache/spark
df2aeb1 [nravi] Improved fix for ConcurrentModificationIssue (Spark-1097, Hadoop-10456)
6b840f0 [nravi] Undo the fix for SPARK-1758 (the problem is fixed)
5108700 [nravi] Fix in Spark for the Concurrent thread modification issue (SPARK-1097, HADOOP-10456)
681b36f [nravi] Fix for SPARK-1758: failing test org.apache.spark.JavaAPISuite.wholeTextFiles
(cherry picked from commit f14b00a9c60863afda15681fbf5682247351fa39)
Signed-off-by: Reynold Xin <rxin@apache.org>
Diffstat (limited to 'sql/catalyst')
0 files changed, 0 insertions, 0 deletions