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

Posted to commits@brooklyn.apache.org by al...@apache.org on 2019/12/11 08:38:09 UTC

[brooklyn-server] 02/03: Merge branch 'master' into pom-jackson-bump

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

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

commit 8610d81f1cc537f3703b92f92527ecb575380593
Merge: 53e99f4 0a01c97
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Dec 6 11:02:59 2019 +0000

    Merge branch 'master' into pom-jackson-bump

 Dockerfile                                         |  3 +
 Jenkinsfile                                        | 86 ++++++++++++++++++++++
 api/pom.xml                                        |  1 +
 .../test/policy/failover/ElectPrimaryTest.java     |  3 +-
 .../core/mgmt/rebind/RebindFeedWithHaTest.java     |  3 +-
 parent/pom.xml                                     | 13 +---
 pom.xml                                            |  8 +-
 rest/rest-resources/pom.xml                        | 12 +++
 .../base/SoftwareProcessStopsDuringStartTest.java  |  3 +-
 utils/common/pom.xml                               |  1 +
 10 files changed, 117 insertions(+), 16 deletions(-)