Merge remote-tracking branch 'remotes/parent/pr/190' 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/8f3ac8b6 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8f3ac8b6 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8f3ac8b6 Branch: refs/heads/master Commit: 8f3ac8b6add0ce755ecbc65f974e9baf36c669c4 Parents: 4dc4650 770e3b5 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Apr 10 12:39:22 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Apr 10 12:39:22 2017 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/dbsync/merge/DbAttributeMerger.java | 7 +++++++ .../org/apache/cayenne/dbsync/merge/DbEntityMerger.java | 7 ++++++- .../apache/cayenne/dbsync/reverse/dbload/EntityLoader.java | 2 ++ .../main/java/org/apache/cayenne/map/DetectedDbEntity.java | 9 +++++++++ docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + 5 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/8f3ac8b6/docs/doc/src/main/resources/RELEASE-NOTES.txt ----------------------------------------------------------------------
