Merge with master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a1f10f42 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a1f10f42 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a1f10f42 Branch: refs/heads/master Commit: a1f10f42e9da3fe7df3c91c14536a25526f3c691 Parents: 06c9183 d8b17c1 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Dec 15 12:11:25 2016 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Dec 15 12:11:25 2016 +0300 ---------------------------------------------------------------------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a1f10f42/docs/doc/src/main/resources/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt index 0c1637d,740698c..ca2395c --- a/docs/doc/src/main/resources/RELEASE-NOTES.txt +++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt @@@ -18,7 -18,7 +18,8 @@@ CAY-2164 Relocate builder bootstrap met CAY-2165 Explicit "contribution" API for easier expansion of DI collections and maps CAY-2166 Auto-loading of Cayenne modules CAY-2168 Split DbLoader to parts and clean it up + CAY-2169 Split DbMerger to parts and clean it up +CAY-2172 Cleanup Modeler import and migrate db actions Bug Fixes:
