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

Posted to commits@brooklyn.apache.org by he...@apache.org on 2019/02/11 19:43:22 UTC

[brooklyn-server] 02/04: Merge branch 'master' into better-coercion

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git

commit 69b9c8b74477700a93e2d1cf7fbc6ced4454eaf1
Merge: 29fc1fd 6ec9a74
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Mon Feb 11 16:35:53 2019 +0000

    Merge branch 'master' into better-coercion

 karaf/jetty-config/src/main/resources/jetty.xml     | 15 +++++++++++++++
 .../brooklyn/rest/filter/CsrfTokenFilter.java       | 21 ++++++++++++---------
 .../rest/util/MultiSessionAttributeAdapter.java     |  9 ++++++++-
 3 files changed, 35 insertions(+), 10 deletions(-)