Merge branch '5.x' into METAMODEL-6/execute-update-return-value Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/d6ab0bed Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/d6ab0bed Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/d6ab0bed
Branch: refs/heads/master Commit: d6ab0bed337fcfc3dd673ed0f9ef4d6e447217af Parents: 774cb59 c5cc9fe Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Mon Dec 14 21:54:11 2015 +0100 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Mon Dec 14 21:54:11 2015 +0100 ---------------------------------------------------------------------- CHANGES.md | 5 +- cassandra/pom.xml | 2 +- core/pom.xml | 2 +- .../org/apache/metamodel/util/FileHelper.java | 36 +-- couchdb/pom.xml | 2 +- csv/pom.xml | 2 +- elasticsearch/common/pom.xml | 6 +- elasticsearch/native/pom.xml | 6 +- elasticsearch/pom.xml | 2 +- elasticsearch/rest/pom.xml | 6 +- excel/pom.xml | 2 +- fixedwidth/pom.xml | 2 +- full/pom.xml | 2 +- hadoop/pom.xml | 2 +- .../util/HdfsDirectoryInputStream.java | 74 +++++ .../metamodel/util/HdfsFileInputStream.java | 88 +++++ .../metamodel/util/HdfsFileOutputStream.java | 68 ++++ .../org/apache/metamodel/util/HdfsResource.java | 324 +++++++++---------- .../apache/metamodel/util/HdfsResourceTest.java | 15 + hbase/pom.xml | 2 +- jdbc/pom.xml | 2 +- .../jdbc/dialects/DefaultQueryRewriter.java | 4 +- .../metamodel/jdbc/JdbcTestTemplates.java | 2 +- json/pom.xml | 2 +- mongodb/pom.xml | 2 +- neo4j/pom.xml | 5 +- openoffice/pom.xml | 2 +- pojo/pom.xml | 2 +- pom.xml | 8 +- salesforce/pom.xml | 2 +- spring/pom.xml | 2 +- sugarcrm/pom.xml | 2 +- xml/pom.xml | 2 +- 33 files changed, 435 insertions(+), 250 deletions(-) ----------------------------------------------------------------------
