You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/12/17 12:17:58 UTC

[3/3] incubator-brooklyn git commit: This closes #1109

This closes #1109


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/548eaba3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/548eaba3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/548eaba3

Branch: refs/heads/master
Commit: 548eaba3cefefb3b0ddb7226bfd8c448cefeea9c
Parents: 3812be0 1b7b5a8
Author: Aled Sage <al...@gmail.com>
Authored: Thu Dec 17 11:17:32 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Dec 17 11:17:32 2015 +0000

----------------------------------------------------------------------
 .../brooklyn/core/entity/EntityAsserts.java     |   2 -
 .../brooklyn/core/entity/EntityFunctions.java   |  32 +++-
 .../apache/brooklyn/core/feed/FeedConfig.java   |  44 +++---
 .../core/entity/EntityFunctionsTest.java        |   6 +
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   |   3 +-
 .../entity/webapp/jboss/JBoss6ServerImpl.java   |   2 +
 .../entity/webapp/jboss/JBoss7ServerImpl.java   |   2 +
 .../entity/webapp/jetty/Jetty6ServerImpl.java   |   4 +-
 .../entity/webapp/tomcat/TomcatServerImpl.java  |   8 +-
 .../AbstractWebAppFixtureIntegrationTest.java   | 152 ++++++++++++-------
 .../JettyWebAppFixtureIntegrationTest.java      |   8 -
 ...omcatServerWebAppFixtureIntegrationTest.java |  24 +--
 .../java/org/apache/brooklyn/test/Asserts.java  |   2 -
 13 files changed, 170 insertions(+), 119 deletions(-)
----------------------------------------------------------------------