Fix conflicts from #806. This closes #806.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/bc834865 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/bc834865 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/bc834865 Branch: refs/heads/0.8.0-incubating Commit: bc8348652d3aec9d4050535e065efb05242d7ef0 Parents: b6a5d80 55985e0 Author: Hadrian Zbarcea <[email protected]> Authored: Sat Aug 8 22:39:29 2015 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Sat Aug 8 22:54:34 2015 -0400 ---------------------------------------------------------------------- .../apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncher.java | 2 +- .../brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/bc834865/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java ---------------------------------------------------------------------- diff --cc usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java index 799b181,aeab8fa..9538073 --- a/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java +++ b/usage/jsgui/src/test/java/org/apache/brooklyn/rest/jsgui/BrooklynJavascriptGuiLauncherTest.java @@@ -27,8 -26,9 +27,8 @@@ import org.testng.annotations.Test import brooklyn.config.BrooklynServiceAttributes; import brooklyn.entity.basic.Entities; import brooklyn.management.ManagementContext; - import brooklyn.rest.BrooklynRestApiLauncherTestFixture; + import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import brooklyn.test.Asserts; -import brooklyn.test.HttpTestUtils; /** Convenience and demo for launching programmatically. */ public class BrooklynJavascriptGuiLauncherTest {
