[brooklyn-server] branch master updated (1b8ddc6 -> ad2e2e1)

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


    from 1b8ddc6  Merge pull request #1136 from rdowner/hashicorp-vault-updates
     new 33bd109  Use the jax-rs annotations to recognize correctly parameters when POST requests to /v1/applications are made
     new e838120  Using String type instead of byte for the FormParam, otherwise we end up with a cast exception (CXF seems to confuse byte, number and string)
     new 3675369  Accept Content-Type of multipart/form-data or application/x-www-form-urlencoded
     new ad2e2e1  Merge pull request #1137 from tbouron/fix/rest-api-annotations

The 12742 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:
 .../apache/brooklyn/rest/api/ApplicationApi.java   | 25 +++++++++++++---------
 .../rest/resources/ApplicationResource.java        |  5 +++--
 2 files changed, 18 insertions(+), 12 deletions(-)