[brooklyn-server] branch master updated (1ff1ea8 -> 8906243)

[tb...@apache.org]

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

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


    from 1ff1ea8  Merge pull request #1220 from tbouron/feature/aggregation-deprecation
     new 862a891  more comments on deprecated REST methods
     new 536dae0  Add missing alternative usage for deprecated method
     new 9e954d2  Update deprecated since to use the right version
     new 8906243  Merge pull request #1215 from ahgittin/more-deprecation

The 13152 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:
 .../main/java/org/apache/brooklyn/rest/api/ActivityApi.java  |  3 ++-
 .../main/java/org/apache/brooklyn/rest/api/BundleApi.java    | 12 +++++-------
 .../main/java/org/apache/brooklyn/rest/api/CatalogApi.java   | 12 +++++++++---
 .../main/java/org/apache/brooklyn/rest/api/LocationApi.java  |  6 +++---
 .../main/java/org/apache/brooklyn/rest/api/LogoutApi.java    |  2 +-
 .../org/apache/brooklyn/rest/resources/BundleResource.java   |  2 +-
 6 files changed, 21 insertions(+), 16 deletions(-)