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 2020/07/22 12:21:02 UTC

[brooklyn] 04/07: Merge branch 'master' into license-update-2020

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.git

commit d5e10b2423b4018f8dd35be8cd04883359e576ea
Merge: 2e8af80 0f77fa1
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Jun 2 09:56:05 2020 +0100

    Merge branch 'master' into license-update-2020

 Dockerfile       | 14 +++++++++-----
 Jenkinsfile      |  2 +-
 README.md        | 12 ++++++------
 brooklyn-client  |  2 +-
 brooklyn-dist    |  2 +-
 brooklyn-docs    |  2 +-
 brooklyn-library |  2 +-
 brooklyn-server  |  2 +-
 brooklyn-ui      |  2 +-
 pom.xml          |  2 +-
 10 files changed, 23 insertions(+), 19 deletions(-)