GitHub user revans2 opened a pull request:

    https://github.com/apache/storm/pull/741

    STORM-1012 STORM-967 STORM-922 STORM-1042 Shaded almost everything 0.10.x

    This is a back-port of https://github.com/apache/storm/pull/736 for 0.10.x

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

    $ git pull https://github.com/revans2/incubator-storm STORM-1042-0.10.x

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

    https://github.com/apache/storm/pull/741.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 #741
    
----
commit e628f61f8ba13df9b2f1614c7e22c55c4b42ecba
Author: Robert (Bobby) Evans <[email protected]>
Date:   2015-09-11T16:56:34Z

    Shaded everything that was not already shaded, and cleaned up build so the 
dependency-reduced pom.xml is used correctly.
    
    Conflicts:
        dev-tools/travis/travis-build.sh
        dev-tools/travis/travis-install.sh
        external/storm-elasticsearch/pom.xml
        external/storm-solr/pom.xml
        pom.xml
        storm-core/pom.xml
        storm-dist/binary/src/main/assembly/binary.xml

commit 7aa2f1f496c3e8af710178e2c54d0204c0247cc9
Author: Robert (Bobby) Evans <[email protected]>
Date:   2015-09-16T13:25:45Z

    Fixed some merge errors

commit b48a2e28a3ba876cbd35648fa13508f95374d1e6
Author: Robert (Bobby) Evans <[email protected]>
Date:   2015-09-16T15:58:29Z

    Adressed review comments
    
    Conflicts:
        dev-tools/travis/travis-install.sh

----


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