Merge remote-tracking branch 'remotes/parent/pr/183' into asf-master # Conflicts: # docs/doc/src/main/resources/RELEASE-NOTES.txt
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5008dcee Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5008dcee Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5008dcee Branch: refs/heads/master Commit: 5008dcee24b70c3ca061aa3677cbffc10c9d00f2 Parents: 4ff5e0e 7006093 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Apr 5 13:28:42 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Apr 5 13:28:42 2017 +0300 ---------------------------------------------------------------------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../getting-started/src/docbkx/java-classes.xml | 6 ++++++ .../src/docbkx/persistent-objects.xml | 16 ++++++++-------- docs/docbook/getting-started/src/docbkx/webapp.xml | 7 +++++-- 4 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5008dcee/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index b7f23af,7b3e18b..c5b1c56 --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -38,7 -37,7 +38,8 @@@ CAY-2250 Remove: Incorrect text in Conf CAY-2256 Cannot Save/Insert an Object With null Flattened (complex) toOne Relationship (see also CAY-2146) CAY-2265 ServerRuntime.builder() fails to set default runtime name when a the project file doesn't follow recognized pattern CAY-2273 Modeler: default suggested cgen location is rooted in subpackage + CAY-2275 Documentation: tutorial is out of sync with 4.0.M5 version +CAY-2276 PrePersist listener registered as PostPersist in LifecycleCallbackRegistry.addListener(Class<?>, LifecycleListener) ---------------------------------- Release: 4.0.M5
