Merge PR #321
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8d3e021c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8d3e021c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8d3e021c Branch: refs/heads/master Commit: 8d3e021c97bb298494458d65f4d50ffe96670a43 Parents: fd8dbc6 2de98ce Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Sep 24 16:26:35 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Sep 24 16:26:35 2018 +0300 ---------------------------------------------------------------------- README.md | 6 +++ .../asciidoc/_cayenne-guide/part5/jCache.adoc | 45 +++++++++++++++++++- .../_getting-started-db-first/part1-setup.adoc | 10 ++--- .../part2-rr-setup.adoc | 28 ++++++------ .../part3-filtering.adoc | 10 ++--- .../part3-updating-model.adoc | 32 +++++++------- .../part4-java-code.adoc | 2 +- 7 files changed, 91 insertions(+), 42 deletions(-) ----------------------------------------------------------------------