streams-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rbnks <...@git.apache.org>
Subject [GitHub] incubator-streams pull request: Apache master merge
Date Wed, 22 Oct 2014 16:50:19 GMT
GitHub user rbnks opened a pull request:

    https://github.com/apache/incubator-streams/pull/112

    Apache master merge

    Merged apache master and handle merge conflicts.

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

    $ git pull https://github.com/w2ogroup/incubator-streams apache_master_merge

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

    https://github.com/apache/incubator-streams/pull/112.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 #112
    
----
commit c4da5e536c1e29e41a7a10cf395d0145846593b4
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-24T20:58:51Z

    STREAMS-62 | Ensured that all processors in incubator-streams/streams-contrib were serializable

commit 665f3040ed48bed799c62c40e07aa88b9943db52
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-24T21:46:04Z

    STREAMS-62 | Removed author information and included Apache License header for new classes

commit 1e3d0f182205a3b0f816d645f4cafaeec3f8940a
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-25T20:00:33Z

    STREAMS-62 | Moved license headers to correct locations

commit 92bd226eadcea7e36be7cef221162b09547e39f6
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-29T18:37:45Z

    All necessary targets/cross parameters from Tweet objects are now converted and stored
as generic extensions.

commit 1278ab11ef64e730f1cf3f0cdeced2ca1fccf7e3
Author: Steve Blackmon <sblackmon@w2ogroup.com>
Date:   2014-04-29T18:55:43Z

    Merge pull request #1 from robdouglas/master
    
    STREAMS-62 | Serializability in processors

commit e70daa6a9c956f1cf38ad99a7d78912cf360002d
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-29T19:21:40Z

    STREAMS-69 | Updated the tweet json schema to model hashtags based on the actual objects
from the provider

commit d554a3a23079a2f2be0c735ee16b2622ecfcdd39
Author: Steve Blackmon <sblackmon@w2ogroup.com>
Date:   2014-04-29T20:03:59Z

    Merge pull request #4 from apache/master
    
    bringing w2o fork up-to-date

commit cb1f7ac58d10195a6b0300930ccd43de4d436842
Author: Steve Blackmon <sblackmon@w2ogroup.com>
Date:   2014-04-29T20:04:39Z

    Merge pull request #3 from robdouglas/STREAMS-69
    
    STREAMS-69 | Updated the tweet json schema to model hashtags based on th...

commit 7795918aa94009801aec4fca9afff97b92a539fc
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-29T20:05:25Z

    STREAMS-69 | Updated Tweet serializer to use LinkDetails object as the URL extension schema

commit a0488956e07412a5ebc21955828f5f33fe3d9f7c
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-29T20:43:30Z

    Fixed the Hashtag mapping in the tweet schema and updated the serializer to only store
hashtag text

commit dce6f21749f162f15a08d1fdecce98da814872d8
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-29T21:06:15Z

    Merge branch 'Generic-Extensions'
    
    Conflicts:
    	streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json

commit 8324d280b19720c8c40a63130f01830146aaf853
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-29T21:07:33Z

    Merge pull request #2 from robdouglas/Generic-Extensions
    
    All necessary targets/cross parameters from Tweet objects are now conver...

commit 100cbcbb05034335dcd50c6221114e6f5e5b566d
Author: mfranklin <mfranklin@apache.org>
Date:   2014-04-30T15:18:17Z

    Merge remote-tracking branch 'apache/master'

commit 081ecd343d181e2d5ceb455341fd79695c95c4e7
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-30T18:11:49Z

    Added in the keywords to the activity extensions object

commit b89448a10b87f1223506536eb34c44a7e7163cd2
Author: Stanton Sievers <ssievers@w2odigital.com>
Date:   2014-04-30T18:22:35Z

    Using an internal versioning scheme.

commit 8d8d9cbc4547561fb80446dce97417d24a135455
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-04-30T18:22:38Z

    Added in extensions having to do with actor profiles

commit 04317d05c2f6f90a4a9820b2ef9b9a7c83f92714
Author: Stanton Sievers <sieverssj@gmail.com>
Date:   2014-04-30T19:04:46Z

    Merge pull request #6 from w2ogroup/InternalVersioning
    
    Using an internal versioning scheme

commit 9a5f3de5f1f8c8cb7bdce039f5ec6dbf6912a8e2
Author: mfranklin <mfranklin@apache.org>
Date:   2014-05-02T17:36:26Z

    Merge remote-tracking branch 'apache/STREAMS-72'

commit 85efe08e78b8f98ca35a42c8b1064689fdbc9be7
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-05-05T18:00:15Z

    Merge pull request #5 from robdouglas/Add-Keywords
    
    Added in the keywords to the activity extensions object

commit ccd78624858e71a6acdf237e9973e3d4e4e6724b
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-05-05T18:00:22Z

    Merge pull request #7 from robdouglas/Add-Actor-Extensions
    
    Add actor extensions

commit 59ca4ecb2cf78a6858230bfb8978803c48bd1077
Author: Steve Blackmon <sblackmon@w2ogroup.com>
Date:   2014-05-05T18:14:04Z

    Merge pull request #8 from smashew/master
    
    Changes

commit 3094e12c2f24741e48fa5680de5c39e58cf60a97
Author: Steve Blackmon <sblackmon@w2ogroup.com>
Date:   2014-05-05T19:00:25Z

    Merge pull request #9 from w2ogroup/STREAMS-70
    
    Resolves https://issues.apache.org/jira/browse/STREAMS-70

commit 520d167af421371b3b9b248cebd969ad6ce3e001
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-05-05T22:30:46Z

    CS-809 | Updated TwitterProfileProcessor to handle raw "user" profiles from the twitter
api (not embedded within a "tweet" or "retweet")

commit 28516efceec5582c07e4aada55a2a0d5e1f7003d
Author: Stanton Sievers <ssievers@w2odigital.com>
Date:   2014-05-06T10:54:40Z

    Using internal versions

commit 9a4f2de3fe452341943231716f81a3aaea8ab636
Author: Stanton Sievers <sieverssj@gmail.com>
Date:   2014-05-06T16:17:04Z

    Merge pull request #14 from w2ogroup/VersionCleanup
    
    Version cleanup

commit 32549ed870187eaa277f62396fc0d49f3619b55b
Author: Stanton Sievers <ssievers@w2odigital.com>
Date:   2014-05-06T17:27:30Z

    Fixing version so the build will pass.

commit 810bc0e36ec0692c4735ad98c10f6eff0da912b3
Author: Steve Blackmon <sblackmon@w2ogroup.com>
Date:   2014-05-07T14:53:12Z

    Merge pull request #16 from w2ogroup/STREAMS-60
    
    Streams 60

commit 696364262d3464f9fe138c2ab662dae687c43eb8
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-05-07T21:39:43Z

    CS-889 | Updated the Retweet serializer to add in generic extensions to both the actor
and object. Moved more generic buildActor() function up to the base activity serializer

commit e46649bfc850c5910734d4323e2cc16c636bc8b4
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-05-08T17:12:19Z

    CS-281 | Now including the actual link to the specified tweet or retweet in the activity
object. Also including generic activity extensions for retweets

commit 28493745ebe1fd09752a22d5120bb42ba0d4f60d
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-05-08T17:13:39Z

    CS-281 | Removed extra addTwitterExtensions function from retweet serializer

----


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message