You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/01/24 13:50:41 UTC

[2/2] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/258' into asf-STABLE-4.0

Merge remote-tracking branch 'remotes/parent/pr/258' into asf-STABLE-4.0


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f0939cb6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f0939cb6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f0939cb6

Branch: refs/heads/STABLE-4.0
Commit: f0939cb6ec962d3e9faf135d0a07577ea1bc2ff7
Parents: 2f22b1e f4ca7af
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Jan 24 16:49:22 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Jan 24 16:49:22 2018 +0300

----------------------------------------------------------------------
 .../server/DelegatingDataSourceFactory.java     | 61 ++++++++++++++++----
 .../DefaultDataSourceFactoryLoaderTest.java     | 49 ++++++++++++++++
 2 files changed, 98 insertions(+), 12 deletions(-)
----------------------------------------------------------------------