GitHub user ambauma opened a pull request:
https://github.com/apache/spark/pull/19528
[SPARK-20393] [Core] Existing patch applied to 1.6 branch.
## What changes were proposed in this pull request?
This is the fix for the master branch applied to the 1.6 branch. My
(unnamed) company will be using Spark 1.6 probably for another year. We have
been blocked from having Spark 1.6 on our workstations until CVE-2017-7678 is
patched, which SPARK-20393 does. I realize there will not be an official Spark
1.6.4 release, but it still seems wise to keep the code there patched for those
who are stuck on that version. Otherwise I imagine several forks duplicating
1.6 compliance and security fixes.
## How was this patch tested?
The patch came with unit tests. The test build passed. Manual testing on
one of the effected screens showed the newline character removed. Screen
display was the same regardless (html ignores newline characters).
Please review http://spark.apache.org/contributing.html before opening a
pull request.
The patch itself is from previous pull requests associated to SPARK-20939.
My original "work" was actions on what to apply to branch 1.6. and I license
the work to the project under the projectâs open source license.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ambauma/spark branch-1.6
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/19528.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #19528
----
commit d9a45aaabfe7a264a34a15896aa0352d911daf45
Author: NICHOLAS T. MARION <nmar...@us.ibm.com>
Date: 2017-05-10T09:59:57Z
Initial Merge of SPARK-20393 to 1.6 branch
commit 630854a58d8fbf562e65ea8b02fd6cd32430f957
Author: ambauma <andrew.m.baum...@gmail.com>
Date: 2017-10-10T20:33:21Z
Removing what I believe is extra code never intended for the Spark 1.6
branch from the merge of SPARK-20393
commit ffe3e9867ef84cfbee72b7ef3d41d902169ec287
Author: ambauma <andrew.m.baum...@gmail.com>
Date: 2017-10-10T21:08:07Z
Adding back in DriverPage.scala
----
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
