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:11:48 UTC

[brooklyn-server] 08/49: Merge branch 'oauth-integration' of https://github.com/frogfather/brooklyn-server into jdServer

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 d6f5aaad3382e80f93719912a74a6e1bebc2097b
Merge: 2beae0d b728046
Author: Juan Cabrerizo <ju...@cloudsoft.io>
AuthorDate: Wed Nov 28 09:43:00 2018 +0000

    Merge branch 'oauth-integration' of https://github.com/frogfather/brooklyn-server into jdServer

 karaf/features/src/main/feature/feature.xml        |   1 +
 pom.xml                                            |   1 +
 rest/rest-resources/pom.xml                        |   6 +
 .../brooklyn/rest/filter/GoogleOauthFilter.java    | 244 +++++++++++++++++++++
 .../main/resources/OSGI-INF/blueprint/service.xml  |   1 +
 5 files changed, 253 insertions(+)