streams-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steveblackmon <...@git.apache.org>
Subject [GitHub] incubator-streams pull request: Merge7,8
Date Sat, 10 May 2014 23:10:02 GMT
GitHub user steveblackmon opened a pull request:

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

    Merge7,8

    This branch contains all updates from PR 7 and PR 8, some modifications to make them work
well together, and some fixes for certain streams-example modules to work again.

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

    $ git pull https://github.com/apache/incubator-streams merge7,8

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

    https://github.com/apache/incubator-streams/pull/14.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 #14
    
----
commit 522096e8a914ea738a97a536ef19a1416453e5f0
Author: Steve Blackmon <sblackmon@w2odigital.com>
Date:   2014-04-14T15:25:27Z

    userstream now writing to ES in real-time

commit c837a2cf8800efd324003ba5a9299c16b9f8701a
Author: mfranklin <mfranklin@apache.org>
Date:   2014-05-01T17:59:32Z

    Updated Persist writer to have a configurable background flush thread

commit 6934c7a0d4c479392c6c147d00af8cd9ed7b3c44
Author: mfranklin <mfranklin@apache.org>
Date:   2014-05-01T22:45:30Z

    Updated termination process

commit fb8f7aea3032296a4c0dd779aca976104de44d61
Author: mfranklin <mfranklin@apache.org>
Date:   2014-05-01T23:53:18Z

    Fixed deadlock issue

commit f62afa57ce5ca19d639c84e89ea29f998a16fbe5
Author: mfranklin <mfranklin@apache.org>
Date:   2014-05-01T23:54:56Z

    Fixed issue where exception terminated thread and it wouldn't start again

commit 7293594eac98535e4b2206dca68da9b73e6cdf24
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-08T17:56:36Z

    merging fixes and addressing serialization problems to get twitter streams-examples working.

commit 7e4e1095f09321210d6ce3acb56f4041680f2d6d
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-08T18:41:28Z

    fixes to get streams-examples working

commit 145ec8472c9cf12e8e376ce09596f354644e587b
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-08T19:15:27Z

    Merge remote-tracking branch 'origin/pr/7' into streamstutorial
    
    Conflicts:
    	streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
    	streams-contrib/streams-persist-elasticsearch/src/main/jsonschema/org/apache/streams/elasticsearch/ElasticsearchWriterConfiguration.json

commit 1cc9d0bb8b54f24f20fa979ba84e9269603b896e
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-08T19:32:14Z

    was missing imports and using random in a way that wouldn't build in jdk6

commit c59ab10ed92c13d3b116c75f63a2fb921f0a43dc
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-08T20:11:44Z

    Merge branch 'streamstutorial' of https://git-wip-us.apache.org/repos/asf/incubator-streams
into streamstutorial
    
    Conflicts:
    	streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
    	streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/provider/TwitterTimelineProvider.java

commit 87bd8a3f874e711933b4e9c0a5e20518c9ff6f79
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-08T22:19:45Z

    fixed premature-timeout

commit 64cd1227caba30021f1cfc0d19e5521ce4c80cf4
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-09T00:27:39Z

    increasing queue size and initializing twitter during prepare

commit 237f2a6ab13c68a61cf715004fe7b85db66237f6
Author: sblackmon <sblackmon@w2odigital.com>
Date:   2014-05-09T20:44:42Z

    line missing from merge

----


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