You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by ygy <gi...@git.apache.org> on 2015/08/07 12:02:21 UTC

[GitHub] incubator-brooklyn pull request: [BROOKLYN-162] package rename to ...

GitHub user ygy opened a pull request:

    https://github.com/apache/incubator-brooklyn/pull/805

    [BROOKLYN-162] package rename to org.apache.brooklyn: software/webapp

    

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

    $ git pull https://github.com/ygy/incubator-brooklyn fix/package-rename-webapp

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

    https://github.com/apache/incubator-brooklyn/pull/805.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 #805
    
----
commit b09a2c8818b05831d57c513362a7fb44cb01dbfa
Author: Yavor Yanchev <ya...@yanchev.com>
Date:   2015-08-07T09:58:06Z

    [BROOKLYN-162] package rename to org.apache.brooklyn: software/webapp

----


---
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-brooklyn pull request: [BROOKLYN-162] package rename to ...

Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:

    https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-130348972
  
    @ygy there's a test failure: `org.apache.brooklyn.rest.domain.EntitySummaryTest.testSerializeToJSON`.
    
    The test says it's expecting `"type":"org.apache.brooklyn.entity.webapp.tomcat.TomcatServer"` but found `"type":"brooklyn.entity.webapp.tomcat.TomcatServer"`.
    
    This fails because https://github.com/apache/incubator-brooklyn/blob/master/software/webapp/src/main/java/brooklyn/entity/webapp/tomcat/TomcatServer.java has not yet been updated.
    
    Did you modify `fixtures/entity-summary.json` in this PR?


---
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-brooklyn pull request: [BROOKLYN-162] package rename to ...

Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:

    https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-129908584
  
    @ygy this has merge conflicts please - can you resolve those, and then ping me and I'll merge it. If I'm not available, then ping anyone else on IRC.


---
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-brooklyn pull request: [BROOKLYN-162] package rename to ...

Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:

    https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-130065368
  
    @ygy still merge conflicts - not sure if you fixed them in your recent commit, but then other merged PRs have introduced conflicts again! Could you rebase against master again please.


---
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-brooklyn pull request: [BROOKLYN-162] package rename to ...

Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:

    https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-130352031
  
    great; next build worked! merging.


---
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-brooklyn pull request: [BROOKLYN-162] package rename to ...

Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:

    https://github.com/apache/incubator-brooklyn/pull/805#issuecomment-129854219
  
    Thanks @ygy - merging.


---
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-brooklyn pull request: [BROOKLYN-162] package rename to ...

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

    https://github.com/apache/incubator-brooklyn/pull/805


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