Merge branch 'master' into 5.x
authorkaspersorensen <i.am.kasper.sorensen@gmail.com>
Mon, 16 May 2016 03:40:06 +0000 (20:40 -0700)
committerkaspersorensen <i.am.kasper.sorensen@gmail.com>
Mon, 16 May 2016 03:51:27 +0000 (20:51 -0700)
commit6d50f0e310f58a7278ef0f4c3b3e090f22707fb6
tree7193f29194be678e0838ab433e5e06c4a274bffd
parent95226631fbff65dd2f97cf99da77477a421ac03e
parent2e39b501091e530ffc39a32767a9e650c1fdcab8
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/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContext.java
elasticsearch/pom.xml
elasticsearch/rest/pom.xml
elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestDataContext.java
excel/pom.xml
fixedwidth/pom.xml
full/pom.xml
hadoop/pom.xml
hbase/pom.xml
jdbc/pom.xml
json/pom.xml
mongodb/pom.xml
mongodb/src/main/java/org/apache/metamodel/mongodb/MongoDbDataContext.java
neo4j/pom.xml
openoffice/pom.xml
pojo/pom.xml
pom.xml
salesforce/pom.xml
spring/pom.xml
sugarcrm/pom.xml
xml/pom.xml
31 files changed:
.travis.yml
CHANGES.md
core/src/main/java/org/apache/metamodel/schema/naming/AlphabeticColumnNamingStrategy.java
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingContext.java
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingContextImpl.java
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingStrategies.java
core/src/main/java/org/apache/metamodel/schema/naming/ColumnNamingStrategy.java
core/src/main/java/org/apache/metamodel/schema/naming/CustomColumnNamingStrategy.java
core/src/main/java/org/apache/metamodel/schema/naming/DelegatingIntrinsicSwitchColumnNamingStrategy.java
core/src/main/java/org/apache/metamodel/schema/naming/UniqueColumnNamingStrategy.java
elasticsearch/native/src/main/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchDataContext.java
elasticsearch/rest/pom.xml
elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/ElasticSearchRestDataContext.java
elasticsearch/rest/src/main/java/org/apache/metamodel/elasticsearch/rest/JestElasticSearchUpdateCallback.java
excel/src/main/java/org/apache/metamodel/excel/ExcelDataContext.java
fixedwidth/pom.xml
fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthColumnSpec.java
fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthConfiguration.java
fixedwidth/src/main/java/org/apache/metamodel/fixedwidth/FixedWidthConfigurationReader.java
fixedwidth/src/test/java/org/apache/metamodel/fixedwidth/FixedWidthConfigurationReaderTest.java
fixedwidth/src/test/resources/metadata_spec1/data.txt
fixedwidth/src/test/resources/metadata_spec1/sas-formatfile-metadata.txt
fixedwidth/src/test/resources/metadata_spec1/sas-input-metadata.txt
full/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
pom.xml