aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10Prashant Sharma2013-10-101-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merge branch 'master' into wip-merge-masterPrashant Sharma2013-10-081-6/+8
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #31 from sundeepn/branch-0.8Reynold Xin2013-10-071-5/+8
| * | | | | | | | | | | | | Merge branch 'master' into scala-2.10Prashant Sharma2013-10-051-0/+3
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | ask ivy/sbt to check local maven repo under ~/.m2Du Li2013-10-011-0/+3
| * | | | | | | | | | | | | Merge branch 'master' into scala-2.10Prashant Sharma2013-10-011-2/+3
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Removed scala -optimize flag.Reynold Xin2013-09-261-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge pull request #930 from holdenk/masterReynold Xin2013-09-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix build on ubuntuHolden Karau2013-09-141-1/+1
| | * | | | | | | | | | | | Update build version in masterPatrick Wendell2013-09-241-1/+1
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
* | / | | | | | | | | | | scala 2.10 requires Java 1.6,Martin Weindel2013-10-051-3/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Sync with master and some build fixesPrashant Sharma2013-09-261-8/+8
|\| | | | | | | | | | |
| * | | | | | | | | | | Bumping Mesos version to 0.13.0Patrick Wendell2013-09-151-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | fixed maven build for scala 2.10Prashant Sharma2013-09-261-2/+1
* | | | | | | | | | | Akka 2.2 migrationPrashant Sharma2013-09-221-9/+9
* | | | | | | | | | | Merge branch 'master' of git://github.com/mesos/spark into scala-2.10Prashant Sharma2013-09-152-6/+31
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #919 from mateiz/jets3tPatrick Wendell2013-09-111-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add explicit jets3t dependency, which is excluded in hadoop-clientMatei Zaharia2013-09-101-0/+1
| * | | | | | | | | | | Fix HDFS access bug with assembly build.Patrick Wendell2013-09-101-0/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #906 from pwendell/ganglia-sinkPatrick Wendell2013-09-081-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Ganglia sinkPatrick Wendell2013-09-081-0/+1
| * | | | | | | | | | | Merge pull request #908 from pwendell/masterMatei Zaharia2013-09-081-1/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix target JVM version in scala buildPatrick Wendell2013-09-081-1/+7
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #904 from pwendell/masterPatrick Wendell2013-09-071-1/+18
| |\| | | | | | | | | |
| | * | | | | | | | | | Adding Apache license to two filesPatrick Wendell2013-09-071-1/+18
| | |/ / / / / / / / /
| * / / / / / / / / / Minor YARN build cleanupsJey Kottalam2013-09-061-2/+2
| |/ / / / / / / / /
* | | | | | | | | | Fixed repl suitePrashant Sharma2013-09-151-5/+5
* | | | | | | | | | Merged with masterPrashant Sharma2013-09-063-69/+142
|\| | | | | | | | |
| * | | | | | | | | Add Apache parent POMMatei Zaharia2013-09-021-0/+5
| * | | | | | | | | Fix some URLsMatei Zaharia2013-09-011-2/+2
| * | | | | | | | | Initial work to rename package to org.apache.sparkMatei Zaharia2013-09-011-4/+8
| * | | | | | | | | Update Maven build to create assemblies expected by new scriptsMatei Zaharia2013-08-291-2/+2
| * | | | | | | | | Provide more memory for testsMatei Zaharia2013-08-291-1/+1
| * | | | | | | | | Change build and run instructions to use assembliesMatei Zaharia2013-08-293-22/+34
| * | | | | | | | | Revert "Merge pull request #841 from rxin/json"Reynold Xin2013-08-261-0/+1
| * | | | | | | | | Upgrade SBT IDE project generatorsJey Kottalam2013-08-231-2/+2
| * | | | | | | | | Fix SBT generation of IDE project filesJey Kottalam2013-08-231-5/+12
| * | | | | | | | | Re-add removed dependency on 'commons-daemon'Jey Kottalam2013-08-221-0/+1
| * | | | | | | | | Merge pull request #855 from jey/update-build-docsMatei Zaharia2013-08-221-4/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove references to unsupported Hadoop versionsJey Kottalam2013-08-211-4/+3
| * | | | | | | | | | Merge pull request #854 from markhamstra/pomUpdateMatei Zaharia2013-08-221-4/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Synced sbt and maven buildsMark Hamstra2013-08-211-4/+1
| * | | | | | | | | | Downgraded default build hadoop version to 1.0.4.Reynold Xin2013-08-211-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'jey/hadoop-agnostic'Matei Zaharia2013-08-201-41/+35
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update SBT build to use simpler fix for Hadoop 0.23.9Jey Kottalam2013-08-191-11/+2
| | * | | | | | | | | Rename YARN build flag to SPARK_WITH_YARNJey Kottalam2013-08-161-5/+7
| | * | | | | | | | | Fix SBT build under Hadoop 0.23.xJey Kottalam2013-08-161-0/+11
| | * | | | | | | | | Fix repl/assembly when YARN enabledJey Kottalam2013-08-161-3/+4
| | * | | | | | | | | Allow make-distribution.sh to specify Hadoop version usedJey Kottalam2013-08-161-6/+22
| | * | | | | | | | | Update default version of Hadoop to 1.2.1Jey Kottalam2013-08-151-1/+1