Merge remote-tracking branch 'remotes/parent/pr/272' 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/e9406153 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e9406153 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e9406153 Branch: refs/heads/master Commit: e9406153f19d2101f316966bb6f8d1614cb4b578 Parents: 1525bc7 42bcdb6 Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue Feb 13 14:40:24 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue Feb 13 14:40:24 2018 +0300 ---------------------------------------------------------------------- .../src/docs/asciidoc/_getting-started-guide/webapp.adoc | 2 +- tutorials/tutorial-rop-client-http2/pom.xml | 5 +++++ .../src/main/java/org/apache/cayenne/tutorial/Http2Client.java | 1 - tutorials/tutorial-rop-client/pom.xml | 5 +++++ .../org/apache/cayenne/tutorial/persistent/client/Main.java | 1 - tutorials/tutorial-rop-server-http2/pom.xml | 6 ++++++ tutorials/tutorial-rop-server/pom.xml | 5 +++++ tutorials/tutorial/pom.xml | 1 + 8 files changed, 23 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
