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/01/16 02:12:15 UTC

[brooklyn-server] 35/49: Merge remote-tracking branch 'jcabrerizo/testOauth' into oauth-merged

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 f03bd6b9b47d1133d3ddc30d7164d20d54513fc9
Merge: f710a50 1402f10
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Jan 10 10:24:36 2019 +0000

    Merge remote-tracking branch 'jcabrerizo/testOauth' into oauth-merged

 .../rest/filter/EntitlementContextFilter.java      | 41 +++++++++++++++++-----
 .../rest/filter/EntitlementContextFilterTest.java  |  2 +-
 .../rest/testing/BrooklynRestResourceTest.java     |  4 +--
 software/winrm/pom.xml                             |  8 +++++
 4 files changed, 44 insertions(+), 11 deletions(-)