This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from caa78c9 This closes #1207
new e7997e7 change to import api to use byte array instead of location
string
add 1db6e58 Merge branch 'apache:master' into
feature/working-peristence-import-api
new 004746e Merge branch 'feature/working-peristence-import-api' of
github.com:zan-mateusz/brooklyn-server into
feature/working-peristence-import-api
add 6ac7b71 Merge branch 'apache:master' into
feature/working-peristence-import-api
new b1fc234 Merge branch 'feature/working-peristence-import-api' of
github.com:zan-mateusz/brooklyn-server into
feature/working-peristence-import-api
new 8fd575b Merge branch 'apache:master' into
feature/working-peristence-import-api
new 0ec0432 Merge branch 'feature/working-peristence-import-api' of
github.com:zan-mateusz/brooklyn-server into
feature/working-peristence-import-api
new c1c0201 persistence import api changed to take the byte array data
rather than archive location
new d69ddeb This closes #1195
new b1ebdc9 Tweak to PR review 1195 - delete temp file
The 8 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:
.../org/apache/brooklyn/rest/api/ServerApi.java | 7 ++--
.../brooklyn/rest/resources/ServerResource.java | 48 +++++++++++++++-------
2 files changed, 37 insertions(+), 18 deletions(-)
