Merge branch '117'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c4ebfa5d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c4ebfa5d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c4ebfa5d Branch: refs/heads/master Commit: c4ebfa5d45ae874496c7a407295bb6f425190e62 Parents: 469bacb 7e97172 Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Thu Nov 3 23:20:15 2016 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Thu Nov 3 23:20:15 2016 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/cayenne/dbsync/merge/DbMerger.java | 3 ++- .../apache/cayenne/dbsync/reverse/filters/FiltersConfig.java | 6 ++++-- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
