Merge remote-tracking branch 'apache-gh/master'
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/6d27a23d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/6d27a23d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/6d27a23d Branch: refs/heads/0.7.0-incubating Commit: 6d27a23de811c4d60600adc15bdcf2649151a6ad Parents: afe37b5 a29eab1 Author: Alex Heneveld <[email protected]> Authored: Wed Jun 24 00:36:47 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:36:47 2015 -0700 ---------------------------------------------------------------------- .../AbstractWebAppFixtureIntegrationTest.java | 15 ++++---- ...Boss7ServerNonInheritingIntegrationTest.java | 40 +++++++++++--------- 2 files changed, 30 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
