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

Posted to commits@metamodel.apache.org by ka...@apache.org on 2019/04/01 17:36:38 UTC

[metamodel] 15/16: Merge remote-tracking branch 'upstream/master'

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 9f9cb8c6ae655fb86c01c7a45fdda14bbfeb878c
Merge: 00807d3 cb581b9
Author: 李小保 <li...@mininglamp.com>
AuthorDate: Sat Mar 30 11:48:48 2019 +0800

    Merge remote-tracking branch 'upstream/master'

 CHANGES.md                                         |  2 +-
 .../metamodel/arff/ArffDataContextFactory.java     | 49 +++++++++++++++++++++
 ...org.apache.metamodel.factory.DataContextFactory |  1 +
 .../nativeclient/ElasticSearchDataContextTest.java | 50 +++++++++++-----------
 excel/pom.xml                                      |  2 +-
 full/pom.xml                                       |  5 +++
 pom.xml                                            |  1 +
 7 files changed, 84 insertions(+), 26 deletions(-)