You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by dongeforever <gi...@git.apache.org> on 2016/12/23 10:27:31 UTC

[GitHub] incubator-rocketmq pull request #9: ROCKETMQ-3 Clean up and perfect the unit...

GitHub user dongeforever opened a pull request:

    https://github.com/apache/incubator-rocketmq/pull/9

    ROCKETMQ-3 Clean up and perfect the unit test of rocketmq-broker

    remove try catch, use assertNotNull etc

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

    $ git pull https://github.com/dongeforever/incubator-rocketmq master

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

    https://github.com/apache/incubator-rocketmq/pull/9.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 #9
    
----
commit 4a35f9575100ca04b379f7903f7134a406c3cd01
Author: zhendongliu.lzd <zh...@alibaba-inc.com>
Date:   2016-12-23T06:49:29Z

    ROCKETMQ-3 Clean up and perfect the unit test of rocketmq-broker

commit b82d36f977dbfa6d966efc3a33d05e50a49c3b7c
Author: zhendongliu.lzd <zh...@alibaba-inc.com>
Date:   2016-12-23T07:14:15Z

    Modify configs in BrokerTestHarness to avoid conflict

commit bc15c7345b58a4acc06c0a050602fed4faf01705
Author: zander <zh...@alibaba-inc.com>
Date:   2016-12-23T07:34:31Z

    Remove unused imports

commit 3f979a8d8500a488a50c1f9830c7e72d27e1d4fa
Author: zander <zh...@alibaba-inc.com>
Date:   2016-12-23T10:21:23Z

    ROCKETMQ-3 Clean up and perfect the unit test of rocketmq-broker, remove try catch, use assertNotNull etc

----


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

[GitHub] incubator-rocketmq issue #9: [ROCKETMQ-3] Clean up and perfect the unit test...

Posted by dongeforever <gi...@git.apache.org>.
Github user dongeforever commented on the issue:

    https://github.com/apache/incubator-rocketmq/pull/9
  
    @WillemJiang the conflicts were resolved. And I tried squashing the commits, but it seemed does not work for the master branch because i had already pushed it to my 'origin' repository. Maybe you can close this PR, and i create a new one using a fresh branch.


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

[GitHub] incubator-rocketmq issue #9: [ROCKETMQ-3] Clean up and perfect the unit test...

Posted by WillemJiang <gi...@git.apache.org>.
Github user WillemJiang commented on the issue:

    https://github.com/apache/incubator-rocketmq/pull/9
  
    @dongeforever I had some trouble to resolve the rebase merge conflict just by pulling the changes from your branch( it looks like there some patch are already merged into the master branch).  Can you rebase the master branch and use squash[1]  create a single commit for it.
    [1]https://makandracards.com/makandra/527-squash-several-git-commits-into-a-single-commit


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

[GitHub] incubator-rocketmq pull request #9: [ROCKETMQ-3] Clean up and perfect the un...

Posted by dongeforever <gi...@git.apache.org>.
Github user dongeforever closed the pull request at:

    https://github.com/apache/incubator-rocketmq/pull/9


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

[GitHub] incubator-rocketmq issue #9: [ROCKETMQ-3] Clean up and perfect the unit test...

Posted by dongeforever <gi...@git.apache.org>.
Github user dongeforever commented on the issue:

    https://github.com/apache/incubator-rocketmq/pull/9
  
    @WillemJiang Thanks for your comments. And a new pull request was created to remove these defects


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