Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'master' into scala-2.10 | Raymond Liu | 2013-11-14 | 1 | -0/+6 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into scala-2.10 | Raymond Liu | 2013-11-13 | 1 | -45/+81 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'scala-2.10' of github.com:ScrapCodes/spark into scala-2.10 | Prashant Sharma | 2013-10-10 | 1 | -3/+3 | |
| |\ \ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into wip-merge-master | Prashant Sharma | 2013-10-08 | 1 | -1/+2 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into scala-2.10 | Prashant Sharma | 2013-10-01 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ | ||||||
| * | | | | | | | | scala 2.10 requires Java 1.6, | Martin Weindel | 2013-10-05 | 1 | -3/+9 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Sync with master and some build fixes | Prashant Sharma | 2013-09-26 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fixed maven build for scala 2.10 | Prashant Sharma | 2013-09-26 | 1 | -24/+18 | |
| * | | | | | | | | version changed 2.9.3 -> 2.10 in shell script. | Prashant Sharma | 2013-09-15 | 1 | -8/+0 | |
| * | | | | | | | | Merge branch 'master' of git://github.com/mesos/spark into scala-2.10 | Prashant Sharma | 2013-09-15 | 1 | -127/+107 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merged with master | Prashant Sharma | 2013-09-06 | 1 | -90/+254 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into master-merge | Prashant Sharma | 2013-07-12 | 1 | -53/+19 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Removed some unnecessary code and fixed dependencies | Prashant Sharma | 2013-07-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | Merge branch 'master' into master-merge | Prashant Sharma | 2013-07-03 | 1 | -18/+90 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fixed maven build without netty fix | Prashant Sharma | 2013-06-14 | 1 | -3/+3 | |
| * | | | | | | | | | | | | Updated to latest stable scala 2.10.1 and akka 2.1.2 | Prashant Sharma | 2013-05-01 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Manually merged scala-2.10 and master | Prashant Sharma | 2013-04-22 | 1 | -20/+45 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Updated maven build for scala 2.10. | folone | 2013-01-20 | 1 | -26/+31 | |
* | | | | | | | | | | | | | | Merge branch 'master' of github.com:apache/incubator-spark | Reynold Xin | 2013-11-25 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix Maven build for metrics-graphite | LiGuoqiang | 2013-11-25 | 1 | -0/+5 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Allow spark on yarn to be run from HDFS. Allows the spark.jar, app.jar, and l... | tgravescs | 2013-11-04 | 1 | -0/+6 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge remote-tracking branch 'spark-upstream/master' | Ankur Dave | 2013-10-30 | 1 | -44/+41 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix Maven build to use MQTT repository | Matei Zaharia | 2013-10-23 | 1 | -0/+11 | |
| * | | | | | | | | | | | Exclusion rules for Maven build files. | Reynold Xin | 2013-10-19 | 1 | -44/+30 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/apache/incubator-spark into index... | Joseph E. Gonzalez | 2013-10-15 | 1 | -1/+24 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Update pom.xml to use version 13 of the ASF parent pom and add mailingLists e... | Henry Saputra | 2013-10-14 | 1 | -1/+24 | |
* | | | | | | | | | | | merged with upstream changes | Joseph E. Gonzalez | 2013-10-14 | 1 | -5/+16 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #19 from aarondav/master-zk | Matei Zaharia | 2013-10-10 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | Standalone Scheduler fault tolerance using ZooKeeper | Aaron Davidson | 2013-09-26 | 1 | -0/+11 | |
| * | | | | | | | | | | Merging build changes in from 0.8 | Patrick Wendell | 2013-10-05 | 1 | -3/+4 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Removed scala -optimize flag. | Reynold Xin | 2013-09-26 | 1 | -1/+0 | |
| |/ / / / / / / / | ||||||
| * | | | | | | / | Update build version in master | Patrick Wendell | 2013-09-24 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merging latest changes from spark main branch | Joseph E. Gonzalez | 2013-09-17 | 1 | -118/+196 | |
|\| | | | | | | | ||||||
| * | | | | | | | Bumping Mesos version to 0.13.0 | Patrick Wendell | 2013-09-15 | 1 | -1/+1 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Use different Hadoop version for YARN artifacts. | Patrick Wendell | 2013-09-13 | 1 | -5/+6 | |
| * | | | | | | Add git scm url for publishing | Patrick Wendell | 2013-09-12 | 1 | -0/+1 | |
| * | | | | | | Add explicit jets3t dependency, which is excluded in hadoop-client | Matei Zaharia | 2013-09-10 | 1 | -0/+5 | |
| * | | | | | | Merge pull request #911 from pwendell/ganglia-sink | Matei Zaharia | 2013-09-09 | 1 | -0/+5 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Adding Manen dependency | Patrick Wendell | 2013-09-09 | 1 | -0/+5 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
| * / | | | | | Fix YARN assembly generation under Maven | Jey Kottalam | 2013-09-06 | 1 | -125/+93 | |
| |/ / / / / | ||||||
| * | | | | | Add Apache parent POM | Matei Zaharia | 2013-09-02 | 1 | -0/+5 | |
| * | | | | | Fix some URLs | Matei Zaharia | 2013-09-01 | 1 | -2/+2 | |
| * | | | | | Initial work to rename package to org.apache.spark | Matei Zaharia | 2013-09-01 | 1 | -7/+7 | |
| * | | | | | Update Maven build to create assemblies expected by new scripts | Matei Zaharia | 2013-08-29 | 1 | -13/+3 | |
| * | | | | | Provide more memory for tests | Matei Zaharia | 2013-08-29 | 1 | -1/+1 | |
| * | | | | | Revert "Merge pull request #841 from rxin/json" | Reynold Xin | 2013-08-26 | 1 | -0/+5 | |
| * | | | | | Merge pull request #855 from jey/update-build-docs | Matei Zaharia | 2013-08-22 | 1 | -6/+6 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Use "hadoop.version" property when specifying Hadoop YARN version too | Jey Kottalam | 2013-08-21 | 1 | -6/+6 | |
| | * | | | | | Downgraded default build hadoop version to 1.0.4. | Reynold Xin | 2013-08-21 | 1 | -1/+1 | |
| * | | | | | | Synced sbt and maven builds | Mark Hamstra | 2013-08-21 | 1 | -5/+11 | |
| |/ / / / / |