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

Posted to commits@juneau.apache.org by ja...@apache.org on 2019/12/20 18:30:43 UTC

[juneau-petstore] 39/41: Merge branch 'master' of https://github.com/apache/juneau-petstore

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

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau-petstore.git

commit 460c255a8580ba523707de92c2dcdd5c8809241c
Merge: d2a8860 f3accd4
Author: rasa <fi...@gmail.com>
AuthorDate: Fri Dec 20 18:14:25 2019 +0200

    Merge branch 'master' of https://github.com/apache/juneau-petstore
    
    merge upstream

 .../java/org/apache/juneau/petstore/dto/Pet.java   |  4 ++--
 .../juneau/petstore/repository/UserRepository.java |  4 +++-
 .../juneau/petstore/rest/PetStoreResource.java     |  1 +
 .../juneau/petstore/service/PetStoreService.java   | 28 ++++++++++++++--------
 4 files changed, 24 insertions(+), 13 deletions(-)