GitHub user cfregly opened a pull request:

    https://github.com/apache/spark/pull/1730

    SPARK-2770:  Rename spark-ganglia-lgpl to ganglia-lgpl

    this PR will may conflict a bit with 
https://github.com/apache/spark/pull/1434 (SPARK-1981 Kinesis Streaming 
support) due to the timing and overlapping build changes, but the merge should 
be pretty straightforward, hopefully.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/cfregly/spark SPARK-2770

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/spark/pull/1730.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 #1730
    
----
commit b3b0ff118cac3c0a5a10f9912b383bb0665c9a1b
Author: Chris Fregly <[email protected]>
Date:   2014-07-16T07:03:04Z

    [SPARK-1981] Add AWS Kinesis streaming support

commit d18e680670dfed3039477941e953b5811adde4ab
Author: Chris Fregly <[email protected]>
Date:   2014-07-16T22:23:21Z

    Merge remote-tracking branch 'upstream/master'
    
    Resolved conflict:
        project/SparkBuild.scala

commit cd68c0d7bb0c1ef38e7c92d0cd6eb4a7ccf2ce27
Author: Chris Fregly <[email protected]>
Date:   2014-07-19T03:16:13Z

    fixed typos and backward compatibility

commit e7c8978482e1092cf599a31b402ab1f4ec11e36c
Author: Chris Fregly <[email protected]>
Date:   2014-07-22T03:09:42Z

    Merge remote-tracking branch 'upstream/master'

commit 828f8aeb1081cf7ad9e5386e1cce933ece9c3d62
Author: Chris Fregly <[email protected]>
Date:   2014-07-22T05:20:42Z

    more cleanup

commit 338997e6e750c206bfb50a654b725be5f33beb07
Author: Chris Fregly <[email protected]>
Date:   2014-07-22T15:54:35Z

    improve build docs for kinesis

commit 6c395619dde93a9b8e9137b1150de4ae5129cf4b
Author: Chris Fregly <[email protected]>
Date:   2014-07-24T03:55:55Z

    parameterized the versions of the aws java sdk and kinesis client

commit 21de67fbc5298ce73dd36fe8372dbeee27f69854
Author: Chris Fregly <[email protected]>
Date:   2014-07-31T00:43:29Z

    Merge remote-tracking branch 'upstream/master'
    
    Incorporated feedback from TD.  Renamed project to kinesis-asl,
    simplified examples, improved docs, fixed bug with AWS
    regions outside of us-east-1

commit db3eefd0b845ade8251235698c74f8bdc5d35e5a
Author: Chris Fregly <[email protected]>
Date:   2014-07-31T00:43:40Z

    Merge remote-tracking branch 'upstream/master'

commit 912640cb344c77102e4ca4d884b8b0d0206ed627
Author: Chris Fregly <[email protected]>
Date:   2014-07-31T01:03:27Z

    changed the foundKinesis class to be a publically-avail class

commit d17ca6d6a36ddf0a3030eacae0eace3fdd758cc5
Author: Chris Fregly <[email protected]>
Date:   2014-07-31T17:00:09Z

    per TD's feedback:  updated docs, simplified the KinesisUtils api

commit bf614e9ed870a3c23670d3783d574b1e4280bd81
Author: Chris Fregly <[email protected]>
Date:   2014-07-31T17:33:20Z

    per matei's feedback:  moved the kinesis examples into the examples/ dir

commit 4b36050fe7d4e5b35d474f4f7135cab2d98c48b2
Author: Chris Fregly <[email protected]>
Date:   2014-08-01T21:52:54Z

    Merge remote-tracking branch 'upstream/master' into SPARK-2770

commit 2a213155697c5e922d3336210b03f97ace8ae5ab
Author: Chris Fregly <[email protected]>
Date:   2014-08-01T22:31:49Z

    SPARK-2770:  Rename spark-ganglia-lgpl to ganglia-lgpl

----


---
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.
---

Reply via email to