Github user vchekan commented on the pull request:

    https://github.com/apache/spark/pull/961#issuecomment-45263936
  
    Hi Tathagata,
    
    I've tried to merge branch-1.0 with master but the conflict in
    ReceiverInputDStream is "this file was created in both branches". This
    conflict wasn't created by my patch, so I think it would be better for
    somebody else to merge "branch-1.0" and "master" and I will follow up with
    my patch.
    
    BTW, I thought that branch-1.0 is a maintenance branch for verion-1 so I
    created patch there. Am I right?
    Also, could you take a look at my comment and advise which way it is better
    to fix this bug: tolerate "invalid" time or prevent calling DStream at
    invalid times?
    https://github.com/apache/spark/pull/961#issuecomment-45125185
    
    Thanks,
    Vadim.
    
    
    On Wed, Jun 4, 2014 at 6:03 PM, Tathagata Das <[email protected]>
    wrote:
    
    > Thanks for the patch. I will take a look shortly. In the meantime, can you
    > merge with the master. The jenkins build is failing because your branch is
    > a little outdated.
    >
    > —
    > Reply to this email directly or view it on GitHub
    > <https://github.com/apache/spark/pull/961#issuecomment-45170668>.
    >
    
    
    
    -- 
    From RFC 2631: In ASN.1, EXPLICIT tagging is implicit unless IMPLICIT is
    explicitly specified


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