Merge remote-tracking branch 'mccabe/eventualregex' into decouple-test-utils
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a1e21b3a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a1e21b3a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a1e21b3a Branch: refs/heads/master Commit: a1e21b3a2eec6281961044656dcf890dd3744329 Parents: 03dbd28 e1edc98 Author: Geoff Macartney <[email protected]> Authored: Mon Nov 2 20:00:03 2015 +0000 Committer: Geoff Macartney <[email protected]> Committed: Mon Nov 2 20:00:03 2015 +0000 ---------------------------------------------------------------------- .../org/apache/brooklyn/test/HttpTestUtils.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1e21b3a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java ----------------------------------------------------------------------
