This is an automated email from the ASF dual-hosted git repository. kaspersor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/metamodel.git
commit 2d682c2bd025776f623a7c4c6cbd0298e2b894fa Merge: 1b4857a ed5ca25 Author: 李小保 <[email protected]> AuthorDate: Wed Jan 23 15:29:53 2019 +0800 Merge remote-tracking branch 'upstream/master' # Conflicts: # jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java CHANGES.md | 4 ++++ jdbc/pom.xml | 2 +- jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-)
