Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

STORM-2018: Supervisor V2 #1697

Merged
merged 11 commits into from
Oct 27, 2016
Merged

STORM-2018: Supervisor V2 #1697

merged 11 commits into from
Oct 27, 2016

Commits on Sep 20, 2016

  1. STORM-2018: Supervisor V2

    Robert (Bobby) Evans committed Sep 20, 2016
    Configuration menu
    Copy the full SHA
    318ab5f View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2016

  1. STORM-2018: Move back to JDK 1.7

    Robert (Bobby) Evans committed Sep 21, 2016
    Configuration menu
    Copy the full SHA
    24ff529 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2016

  1. Merge branch 'STORM-2117' of https://github.com/HeartSaVioR/storm int… 

    …o STORM-2117

STROM-2117:  Supervisor V2 with local mode extracts resources directory to the wrong directory
    Robert (Bobby) Evans committed Sep 23, 2016
    Configuration menu
    Copy the full SHA
    fb42b96 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'STORM-2110' of https://github.com/revans2/incubator-storm… 

    … into STORM-2110

Conflicts:
	storm-core/test/jvm/org/apache/storm/daemon/supervisor/BasicContainerTest.java
    @HeartSaVioR
    HeartSaVioR authored and Robert (Bobby) Evans committed Sep 23, 2016
    Configuration menu
    Copy the full SHA
    88619b2 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2016

  1. Merge branch 'STORM-2109' of https://github.com/revans2/incubator-storm… 

    … into STORM-2109
    @HeartSaVioR
    HeartSaVioR authored and Robert (Bobby) Evans committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    2297757 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'STORM-2122' of https://github.com/revans2/incubator-storm… 

    … into STORM-2122
    @HeartSaVioR
    HeartSaVioR authored and Robert (Bobby) Evans committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    b12c288 View commit details
    Browse the repository at this point in the history

  3. Bad include for JDK 7 support

    Robert (Bobby) Evans committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    905c443 View commit details
    Browse the repository at this point in the history

  4. Another java 7 fix

    Robert (Bobby) Evans committed Sep 26, 2016
    Configuration menu
    Copy the full SHA
    f12b7da View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. Merge branch '1.x-branch' into STORM-2018-1.x 

    Conflicts:
	storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
    Robert (Bobby) Evans committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    1d4d414 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'STORM-2131' of https://github.com/knusbaum/incubator-storm

    @knusbaum
    knusbaum authored and Robert (Bobby) Evans committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    81cd074 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. Removed healthcheck.clj. Is not needed

    Robert (Bobby) Evans committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    df33efd View commit details
    Browse the repository at this point in the history