[juneau] branch master updated (e2ad7c7 -> 4fd8ba5)

[ja...@apache.org]

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

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


    from e2ad7c7  PetStore example updates.
     add f6f3016  Fix dto example broken urls
     new 4fd8ba5  Merge pull request #10 from shalithasuranga/patch001

The 1 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/juneau/examples/rest/dto/AtomFeedResource.java | 2 +-
 .../src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java  | 2 +-
 .../java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java    | 2 +-
 .../org/apache/juneau/examples/rest/dto/PredefinedLabelsResource.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

[juneau] 01/01: Merge pull request #10 from shalithasuranga/patch001

[ja...@apache.org]

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

commit 4fd8ba5d543326d5f1bc3907af3030a87b38b51a
Merge: e2ad7c7 f6f3016
Author: James Bognar <ja...@apache.org>
AuthorDate: Mon Nov 5 12:53:54 2018 -0500

    Merge pull request #10 from shalithasuranga/patch001
    
    Fix dto example broken urls

 .../main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java | 2 +-
 .../src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java  | 2 +-
 .../java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java    | 2 +-
 .../org/apache/juneau/examples/rest/dto/PredefinedLabelsResource.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)