streams-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From RichHatch <...@git.apache.org>
Subject [GitHub] incubator-streams pull request: SBP 2410
Date Fri, 28 Aug 2015 20:11:25 GMT
GitHub user RichHatch opened a pull request:

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

    SBP 2410

    SBP-2410 Fixed an error message
    
    SBP-2410 Fixed the the sprinklr -> activity transformation.

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

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

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

    https://github.com/apache/incubator-streams/pull/250.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 #250
    
----
commit b2eed814fff9da641ae8cb6616ea0236bbac42c4
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2014-12-04T00:20:27Z

    Auto-merge | Integrating changes from apache/master

commit 933837212f64912db2e656e907b19825b041fbfe
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2014-12-05T20:49:16Z

    [artifactory-release] Next development version

commit 8f756d41a88f2744485ff508097e92cf12d3f3e9
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-05T23:07:29Z

    Merge branch 'master' of https://github.com/w2ogroup/incubator-streams into w2o-master

commit 5138082a0112e41724fb70f4bd1df3d397673c75
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-08T17:44:19Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-streams into
w2o-master
    
    Conflicts:
    	streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
    	streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/TestLinkUnwinderProcessor.java
    	streams-util/pom.xml
    	streams-web/pom.xml

commit 05afb9e782f727511702a278597dc404522da54d
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-09T15:42:23Z

    Merge branch 'STREAMS-243' into w2o-master

commit f8622f353d1eae8d6d15a8ebfcd195941ce9c071
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-11T19:07:18Z

    Merge branch 'master' into w2o-master

commit b4e066be0b83bdd63da71582f88b1401753168a9
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-11T19:45:32Z

    Fixed merge conflict issues

commit 6e5d6ea1c4909f98193641b76d083824189d6f84
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-12-11T19:48:37Z

    Merge pull request #84 from robdouglas/w2o-master
    
    W2o master

commit ff57b316282d96302d97c219b762e5a55ad8dadd
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-11T20:05:21Z

    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-streams into
w2o-master
    
    Conflicts:
    	streams-components/streams-converters/pom.xml

commit 8bd99550933a57d0b700f1004acdedaaf8db52ee
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-12-11T20:05:58Z

    Merge pull request #85 from robdouglas/w2o-master
    
    W2o master

commit 6e49895944a1c52a99e6799395f9e2acd1b2e3a8
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-11T20:14:35Z

    Fixed dependency version mismatches

commit ad2bf026d54aa5fa7fdf34feaaabf0cbd69c5d82
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-12-11T20:14:41Z

    Merge pull request #86 from robdouglas/w2o-master
    
    Fixed dependency version mismatches

commit 19551831d2eb18af9c4bbbd4385fcfa6fadc00bc
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2014-12-11T20:31:27Z

    Auto-merge | Integrating changes from apache/master

commit 3c790a35ef164f79327d0b8bfda2843c8a51b443
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-11T23:28:01Z

    Merge branch 'STREAMS-252' into w2o-master
    
    Conflicts:
    	streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java

commit 3413715d87d8ef39583f1de95622023038109133
Author: Stanton Sievers <ssievers@w2odigital.com>
Date:   2014-12-12T11:58:43Z

    Merge commit '7f69bd4507e4d6caa0de16c7a7a7c2faf52e7b64' into w2o-master-conflicts
    
    Conflicts:
    	streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java

commit 7a9dfb3a1be6681857f1e42e6a653dff195f6cec
Author: Stanton Sievers <sieverssj@gmail.com>
Date:   2014-12-12T15:53:24Z

    Merge pull request #87 from w2ogroup/w2o-master-conflicts
    
    Fix conflicts between apache:master and w2ogroup:master

commit dd00736dc161a61f5a5f8c5cb0a1751b401ce347
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2014-12-12T16:40:10Z

    [artifactory-release] Next development version

commit 23b04a1f0b77757ffaf0e96254f67b287e9dd0b5
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-15T21:19:29Z

    Fixed build issues related to LinkResovler and LinkDetails being out of date

commit 0b9ecd383540bf9e514d0b8fc6c82ece296def43
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-15T21:25:51Z

    Merge branch 'w2o-master' into build-fix
    
    Conflicts:
    	streams-contrib/pom.xml
    	streams-contrib/streams-provider-datasift/pom.xml

commit 544f552b5e49ac4d83f6b89f4f356fd97aa0bc4c
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-15T21:28:09Z

    Took out accidentally committed files

commit cd0641066d527e0465ece450625d82bd8788fa52
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-15T21:37:19Z

    Fixed test

commit c836610ba9b84ab63f6c3030499c0c617a9433f0
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2014-12-15T22:02:30Z

    Fixed pom issues

commit 679e76ef13e443b35eaede8f2ab1728e4810ada2
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2014-12-15T22:05:01Z

    Merge pull request #88 from robdouglas/build-fix
    
    Build fix

commit 39c7a6a154e9830799b60a912d216e102726937a
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2014-12-16T16:31:01Z

    [artifactory-release] Next development version

commit c5e19515c8d8fbafc398fea09591168ab6b97063
Author: Robert Douglas <rdouglas@w2ogroup.com>
Date:   2015-01-06T20:07:21Z

    Merge branch 'STREAMS-261' into w2o-master

commit 0593884a9542fce453d5c94ac27bef5c7805c81d
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2015-01-06T21:46:46Z

    Merge pull request #89 from robdouglas/STREAMS-260
    
    STREAMS-260 | Only calling the back off strategy in the even that we get...

commit feb0835828141599afcf38167128ab5dfda669cb
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2015-01-06T22:53:12Z

    Merge pull request #90 from robdouglas/STREAMS-263
    
    STREAMS-263 | Can now support Pages, in addition to Facebook Posts

commit 7af221e7500524b4b0ea0bd57ff256f6a9339e5a
Author: Robert Douglas <rdouglas@w2odigital.com>
Date:   2015-01-06T22:53:16Z

    Merge pull request #91 from robdouglas/STREAMS-261
    
    Streams 261 | Facebook Bio Provider

commit 455ac3f3e8df5b5bc19be37d2fe3b9a62cfb62df
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2015-01-07T00:26:17Z

    Auto-merge | Integrating changes from apache/master

commit 3ad5d4705940143ef365ccd7f78fd6e94a3794a4
Author: CloudBees DEV@Cloud <nobody@cloudbees.com>
Date:   2015-01-07T17:35:55Z

    Auto-merge | Integrating changes from apache/master

----


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