Merge branch '5.x' into java-8-functions
authorKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Wed, 10 May 2017 03:56:44 +0000 (20:56 -0700)
committerKasper Sørensen <i.am.kasper.sorensen@gmail.com>
Wed, 10 May 2017 03:56:44 +0000 (20:56 -0700)
commite5381fd47763968bce63057627e31de4e1f7b01e
treee8843d70b13901cff9bc4ae74a095b462e30041e
parent400fc73165e87a9930a736c229e366232935e8ad
parentc4788a27270110ee630e0337402f4f48b6147ac1
Merge branch '5.x' into java-8-functions

# Conflicts:
# core/src/main/java/org/apache/metamodel/MetaModelHelper.java
core/src/main/java/org/apache/metamodel/MetaModelHelper.java
core/src/main/java/org/apache/metamodel/intercept/InterceptableDataContext.java
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
jdbc/src/main/java/org/apache/metamodel/jdbc/JdbcDataContext.java
salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceUpdateCallback.java