You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/02/12 14:32:33 UTC

[4/4] cayenne git commit: Merge branch 'master' of alex:apache/cayenne

Merge branch 'master' of alex:apache/cayenne


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

Branch: refs/heads/master
Commit: a9f43dbedf88d8a86f1daea87f5aee5b6b5e3846
Parents: 4147cb4 fb8686d
Author: kolonitsky <Al...@gmail.com>
Authored: Thu Feb 12 16:32:07 2015 +0300
Committer: kolonitsky <Al...@gmail.com>
Committed: Thu Feb 12 16:32:07 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/cayenne/access/types/CharType.java   | 6 +++---
 .../main/resources/org/apache/cayenne/dba/oracle/types.xml    | 6 +++---
 .../org/apache/cayenne/tools/dbimport/DbImportAction.java     | 7 +++++--
 .../org/apache/cayenne/tools/dbimport/DbImportActionTest.java | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------