GitHub user tdas opened a pull request:
https://github.com/apache/spark/pull/562
[Spark-1382] Fix NPE in DStream.slice (updated version of #365)
@zsxwing I cherry-picked your changes and merged the master. #365 had some
conflicts once again!
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/tdas/spark SPARK-1382
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/562.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 #562
----
commit 35ba56ae30165c8b67f843952766494942be00df
Author: zsxwing <[email protected]>
Date: 2014-04-09T02:59:39Z
SPARK-1382: Fix NPE in DStream.slice
commit e476651c4367e23b1f6ca3f99dd394e9d2a127c8
Author: zsxwing <[email protected]>
Date: 2014-04-17T02:59:32Z
Merge remote-tracking branch 'origin/master' into SPARK-1382
commit 20968d92a68ac89b1ef2a53cc0106a1abc80010e
Author: zsxwing <[email protected]>
Date: 2014-04-17T06:26:40Z
Replace Exception with SparkException in DStream
commit e2962c1fc79a7e575b2cc93aff093057ac1afc16
Author: Tathagata Das <[email protected]>
Date: 2014-04-26T00:57:49Z
Merge remote-tracking branch 'apache-github/master' into SPARK-1382
Conflicts:
streaming/src/main/scala/org/apache/spark/streaming/dstream/DStream.scala
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
