Merge branch 'master' into osgi-serialization-better
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f23f4cb0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f23f4cb0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f23f4cb0 Branch: refs/heads/master Commit: f23f4cb019acdedd9141581d75e155ebce6314a0 Parents: 5ab0953 30292c9 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Wed Jun 7 12:09:24 2017 +0100 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Wed Jun 7 12:09:24 2017 +0100 ---------------------------------------------------------------------- .../core/effector/http/HttpCommandEffector.java | 68 ++++++++++++++++++-- .../http/HttpCommandEffectorHttpBinTest.java | 35 +++++++++- .../effector/http/HttpCommandEffectorTest.java | 24 +++++++ .../effector/http/url-encoded-response.json | 16 +++++ .../rest/resources/CatalogResource.java | 2 +- 5 files changed, 134 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
