aboutsummaryrefslogtreecommitdiff
path: root/project
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'spark-upstream/master'Ankur Dave2013-10-301-7/+22
|\
| * Exclude jopt from kafka dependency.Patrick Wendell2013-10-251-0/+1
| * Fix Maven build to use MQTT repositoryMatei Zaharia2013-10-231-3/+3
| * Merge pull request #64 from prabeesh/masterMatei Zaharia2013-10-231-1/+5
| |\
| | * remove unused dependencyprabeesh2013-10-171-2/+0
| | * added mqtt adapter library dependenciesprabeesh2013-10-161-1/+7
| * | Merge pull request #56 from jerryshao/kafka-0.8-devMatei Zaharia2013-10-211-3/+6
| |\ \
| | * | Upgrade Kafka 0.7.2 to Kafka 0.8.0-beta1 for Spark Streamingjerryshao2013-10-121-3/+6
| * | | Merge pull request #66 from shivaram/sbt-assembly-depsMatei Zaharia2013-10-181-3/+10
| |\ \ \
| | * | | Rename SBT target to assemble-deps.Shivaram Venkataraman2013-10-161-5/+5
| | * | | Merge branch 'master' of https://github.com/apache/incubator-spark into sbt-a...Shivaram Venkataraman2013-10-152-11/+44
| | |\| |
| | * | | Add a comment and exclude toolsShivaram Venkataraman2013-10-111-1/+2
| | * | | Add new SBT target for dependency assemblyShivaram Venkataraman2013-10-091-1/+7
| | | |/ | | |/|
* | | | Merge branch 'master' of https://github.com/apache/incubator-spark into index...Joseph E. Gonzalez2013-10-181-0/+1
|\| | |
| * | | Fixing spark streaming example and a bug in examples build.Patrick Wendell2013-10-151-0/+1
| | |/ | |/|
* | | merged with upstream changesJoseph E. Gonzalez2013-10-141-7/+14
|\| |
| * | Merge pull request #19 from aarondav/master-zkMatei Zaharia2013-10-101-0/+1
| |\ \
| | * | Standalone Scheduler fault tolerance using ZooKeeperAaron Davidson2013-09-261-0/+1
| * | | Merge pull request #31 from sundeepn/branch-0.8Reynold Xin2013-10-071-5/+8
| * | | ask ivy/sbt to check local maven repo under ~/.m2Du Li2013-10-011-0/+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
* | | | GraphX now builds with all merged changes.Joseph E. Gonzalez2013-09-171-7/+9
* | | | Merging latest changes from spark main branchJoseph E. Gonzalez2013-09-174-74/+123
|\| | |
| * | | Bumping Mesos version to 0.13.0Patrick Wendell2013-09-151-1/+1
| |/ /
| * | 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
| |/
| * 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
| |\ \ | | |/ | |/|
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-08 12:57:01 +0000