Merge remote-tracking branch 'remotes/parent/pr/270' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/90e97a34 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/90e97a34 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/90e97a34 Branch: refs/heads/master Commit: 90e97a341449370f5257033c2e5933304c10276a Parents: 8dd8b1d 40001f6 Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue Feb 13 14:10:11 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue Feb 13 14:10:11 2018 +0300 ---------------------------------------------------------------------- tutorials/pom.xml | 2 +- tutorials/tutorial-rop-client/pom.xml | 4 ++-- .../apache/cayenne/tutorial/persistent/client/Main.java | 4 ++++ .../java/org/apache/cayenne/tutorial/Http2Server.java | 11 +++++++++-- .../src/main/resources/cayenne-project.xml | 9 +++++---- .../src/main/resources/datamap.map.xml | 10 +++++----- tutorials/tutorial-rop-server/pom.xml | 5 ----- 7 files changed, 26 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
