storm-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (STORM-398) upmerge error in security drpc.clj
Date Wed, 09 Jul 2014 17:53:04 GMT

    [ https://issues.apache.org/jira/browse/STORM-398?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14056515#comment-14056515
] 

ASF GitHub Bot commented on STORM-398:
--------------------------------------

GitHub user revans2 opened a pull request:

    https://github.com/apache/incubator-storm/pull/182

    STORM-398: Fixed merge error in drpc.clj

    

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

    $ git pull https://github.com/revans2/incubator-storm STORM-398

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

    https://github.com/apache/incubator-storm/pull/182.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 #182
    
----
commit 642ed743140acf7f9eec56cd98c65ac8435dfe9d
Author: Robert (Bobby) Evans <evans@yahoo-inc.com>
Date:   2014-07-09T17:49:59Z

    Fixed merge error in drpc.clj

----


> upmerge error in security drpc.clj
> ----------------------------------
>
>                 Key: STORM-398
>                 URL: https://issues.apache.org/jira/browse/STORM-398
>             Project: Apache Storm (Incubating)
>          Issue Type: Bug
>            Reporter: Robert Joseph Evans
>            Assignee: Robert Joseph Evans
>              Labels: security
>
> There was a merge error in drpc.clj on the security branch that prevents drpc from coming
up.



--
This message was sent by Atlassian JIRA
(v6.2#6252)

Mime
View raw message