ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
spark-instrumented-optimizer/dev
History
Patrick Wendell 87d0928a33 SPARK-1431: Allow merging conflicting pull requests 
Sometimes if there is a small conflict it's nice to be able to just
manually fix it up rather than have another RTT with the contributor.

Author: Patrick Wendell <pwendell@gmail.com>

Closes #342 from pwendell/merge-conflicts and squashes the following commits:

cdce61a [Patrick Wendell] SPARK-1431: Allow merging conflicting pull requests
2014-04-06 21:04:45 -07:00
..
audit-release SPARK-1387. Update build plugins, avoid plugin version warning, centralize versions 2014-04-06 17:41:01 -07:00
create-release SPARK-1314: Use SPARK_HIVE to determine if we include Hive in packaging 2014-04-06 17:48:41 -07:00
check-license SPARK-1144 Added license and RAT to check licenses. 2014-03-24 08:44:20 -07:00
merge_spark_pr.py SPARK-1431: Allow merging conflicting pull requests 2014-04-06 21:04:45 -07:00
README.md Merge pull request #565 from pwendell/dev-scripts. Closes #565. 2014-02-08 23:13:34 -08:00
run-tests HOTFIX for broken CI, by SPARK-1336 2014-04-04 22:49:19 -07:00
scalastyle HOTFIX for broken CI, by SPARK-1336 2014-04-04 22:49:19 -07:00

README.md

Spark Developer Scripts

This directory contains scripts useful to developers when packaging, testing, or committing to Spark.

Many of these scripts require Apache credentials to work correctly.