diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-08 00:38:31 -0800 |
| commit | bc81ce040ded3fe791ecffb15baa408346afc92a (patch) | |
| tree | 3330fddcffbca7bd8f42f2fa96ded31cdb0430f9 /project/build.properties | |
| parent | 3ec21f2eee0a322bcb5cce9678a816b012227a61 (diff) | |
| parent | bb6a39a6872fb8e7118c5a402b7b9d67459e9a64 (diff) | |
| download | spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.gz spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.bz2 spark-bc81ce040ded3fe791ecffb15baa408346afc92a.zip | |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala
pom.xml
Diffstat (limited to 'project/build.properties')
| -rw-r--r-- | project/build.properties | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/project/build.properties b/project/build.properties index 9647277162..839f5fbb0c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -14,5 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # - sbt.version=0.12.4 |