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/23 12:59:05 UTC
[2/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/259' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/259' 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/f46a3042
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f46a3042
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f46a3042
Branch: refs/heads/master
Commit: f46a30428041431a7d7ef7fe35f6dd156018eff7
Parents: 54bb53a ab67522
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Jan 23 15:10:58 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Jan 23 15:10:58 2018 +0300
----------------------------------------------------------------------
.../server/DelegatingDataSourceFactory.java | 64 ++++++++++++++++----
.../DefaultDataSourceFactoryLoaderTest.java | 53 +++++++++++++++-
2 files changed, 102 insertions(+), 15 deletions(-)
----------------------------------------------------------------------