aboutsummaryrefslogtreecommitdiff
path: root/docs/building-with-maven.md
diff options
context:
space:
mode:
authorMridul Muralidharan <mridul@gmail.com>2013-04-24 09:24:17 +0530
committerMridul Muralidharan <mridul@gmail.com>2013-04-24 09:24:17 +0530
commitdd515ca3ee011cbf9b6941bb45afc55fd905fda8 (patch)
tree284b4c31d0d7c8c06b4f78125ddb50037ee50630 /docs/building-with-maven.md
parentadcda84f9646f12e6d5fb4f1e5e3a1b0a98b7c9f (diff)
parent17e076de800ea0d4c55f2bd657348641f6f9c55b (diff)
downloadspark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.gz
spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.bz2
spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.zip
Attempt at fixing merge conflict
Diffstat (limited to 'docs/building-with-maven.md')
-rw-r--r--docs/building-with-maven.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/building-with-maven.md b/docs/building-with-maven.md
index c2eeafd07a..04cd79d039 100644
--- a/docs/building-with-maven.md
+++ b/docs/building-with-maven.md
@@ -42,10 +42,10 @@ To run a specific test suite:
You might run into the following errors if you're using a vanilla installation of Maven:
- [INFO] Compiling 203 Scala sources and 9 Java sources to /Users/andyk/Development/spark/core/target/scala-2.9.2/classes...
+ [INFO] Compiling 203 Scala sources and 9 Java sources to /Users/me/Development/spark/core/target/scala-{{site.SCALA_VERSION}}/classes...
[ERROR] PermGen space -> [Help 1]
- [INFO] Compiling 203 Scala sources and 9 Java sources to /Users/andyk/Development/spark/core/target/scala-2.9.2/classes...
+ [INFO] Compiling 203 Scala sources and 9 Java sources to /Users/me/Development/spark/core/target/scala-{{site.SCALA_VERSION}}/classes...
[ERROR] Java heap space -> [Help 1]
To fix these, you can do the following: