[brooklyn-library] branch master updated (943d0fa7c -> 5e0464124)

[iu...@apache.org]

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

iuliana pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git


    from 943d0fa7c Merge pull request #189 from algairim/build/Jenkinsfile
     new b0d406912 Introduce nginx-multi type
     new ebbaa68eb Upstream sync policy for NGINX multi
     new 085dad9ef Revert geoscaling-logo.gif classpath
     new 5e0464124 Merge pull request #190 from algairim/nginx-multi

The 3796 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../entity/proxy/nginx/NginxController.java        |   7 +-
 .../entity/webapp/nginx/UpstreamSyncPolicy.java    |  67 +++++++++
 software/webapp/src/main/resources/catalog.bom     |   4 +-
 software/webapp/src/main/resources/nginx-logo.jpeg | Bin 4546 -> 0 bytes
 software/webapp/src/main/resources/nginx-logo.png  | Bin 0 -> 14891 bytes
 .../main/resources/scripts/nginx-render-server.sh  |  18 ++-
 .../resources/scripts/nginx-render-upstream.sh}    |  25 +--
 .../webapp/src/main/resources/yaml/nginx-multi.bom | 167 +++++++++++++++++++++
 8 files changed, 266 insertions(+), 22 deletions(-)
 create mode 100644 software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nginx/UpstreamSyncPolicy.java
 delete mode 100644 software/webapp/src/main/resources/nginx-logo.jpeg
 create mode 100644 software/webapp/src/main/resources/nginx-logo.png
 copy qa/src/test/projects/downstream-parent-test/src/main/resources/catalog.bom => software/webapp/src/main/resources/scripts/nginx-render-server.sh (76%)
 copy software/{cm/chef/src/main/resources/catalog.bom => webapp/src/main/resources/scripts/nginx-render-upstream.sh} (69%)
 create mode 100644 software/webapp/src/main/resources/yaml/nginx-multi.bom