Merge branch 'master' into 5.x
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Mon, 11 Jul 2016 04:27:21 +0000 (21:27 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Mon, 11 Jul 2016 04:27:21 +0000 (21:27 -0700)
commit02397db0a15ef50ae3135143b4f60be75921fbd9
treeafa65824b7b64fbc2fc23baea1811389f21d7414
parentdd0cff7856f8d000dd1f8655b3134f4b3754bc09
parent52c3dafcf0f1ca6256f8da82c9825c121f833a80
Merge branch 'master' into 5.x

Conflicts:
CHANGES.md
cassandra/pom.xml
core/pom.xml
couchdb/pom.xml
csv/pom.xml
elasticsearch/common/pom.xml
elasticsearch/native/pom.xml
elasticsearch/pom.xml
elasticsearch/rest/pom.xml
excel/pom.xml
fixedwidth/pom.xml
full/pom.xml
hadoop/pom.xml
hbase/pom.xml
jdbc/pom.xml
json/pom.xml
mongodb/common/pom.xml
mongodb/mongo2/pom.xml
mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java
mongodb/mongo3/pom.xml
mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java
mongodb/pom.xml
neo4j/pom.xml
openoffice/pom.xml
pojo/pom.xml
pom.xml
salesforce/pom.xml
spring/pom.xml
sugarcrm/pom.xml
xml/pom.xml
CHANGES.md
cassandra/pom.xml
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
fixedwidth/pom.xml
jdbc/pom.xml
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcUpdateCallback.java
mongodb/mongo2/src/main/java/org/apache/metamodel/mongodb/mongo2/MongoDbDataContext.java
mongodb/mongo3/src/main/java/org/apache/metamodel/mongodb/mongo3/MongoDbDataContext.java
pom.xml