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/04/11 11:45:40 UTC
[2/3] cayenne git commit: Merge PR #284
Merge PR #284
# Conflicts:
# modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4314caff
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4314caff
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4314caff
Branch: refs/heads/master
Commit: 4314caff293fcb1a7333fc9ab89f33d0edc7d0bc
Parents: 6bdef0c 123c2fb
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 11 14:41:50 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 11 14:41:50 2018 +0300
----------------------------------------------------------------------
.../modeler/action/GetDbConnectionAction.java | 17 +++++----
.../cayenne/modeler/pref/DBConnectionInfo.java | 39 ++++++++++++--------
2 files changed, 33 insertions(+), 23 deletions(-)
----------------------------------------------------------------------