Merge branch 'ish/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/60a66d81 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/60a66d81 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/60a66d81 Branch: refs/heads/master Commit: 60a66d813139f2f47c2504d993b180462ab6129d Parents: dd32f1d ff38058 Author: Aristedes Maniatis <a...@ish.com.au> Authored: Fri Feb 12 10:34:58 2016 +1100 Committer: Aristedes Maniatis <a...@ish.com.au> Committed: Fri Feb 12 10:34:58 2016 +1100 ---------------------------------------------------------------------- .../access/loader/filters/FiltersConfig.java | 19 +++++++++++++++++++ .../CayenneDataObjectSetToManyCollectionIT.java | 19 +++++++++++++++++++ .../cayenne/CayenneDataObjectSetToManySetIT.java | 19 +++++++++++++++++++ .../access/loader/filters/FiltersConfigTest.java | 19 +++++++++++++++++++ .../testdo/array_type/ArrayTestEntity.java | 19 +++++++++++++++++++ .../lifecycle_callbacks_order/Lifecycle.java | 19 +++++++++++++++++++ pom.xml | 5 +++-- 7 files changed, 117 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
