Merge remote-tracking branch 'origin/master' into METAMODEL-176

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/fc2752ab
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/fc2752ab
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/fc2752ab

Branch: refs/heads/master
Commit: fc2752abd48f35f91e8058df19c379b37197ef53
Parents: 4b5decb 1f6cd03
Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
Authored: Tue Aug 18 22:38:41 2015 +0200
Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
Committed: Tue Aug 18 22:38:41 2015 +0200

----------------------------------------------------------------------
 CHANGES.md                                      |  1 +
 .../cassandra/CassandraDataContextTest.java     | 77 ++++++++++++--------
 2 files changed, 49 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metamodel/blob/fc2752ab/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index d4f35c0,3257bf3..f72768a
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -1,9 -1,9 +1,10 @@@
  ### Apache MetaModel (latest)
  
   * [METAMODEL-173] - Improved CSV writing to non-file destinations. Added 
.write() and .append() methods to Resource interface.
 + * [METAMODEL-176] - Trimmed the transient dependencies of the JDBC module.
   * [METAMODEL-170] - Dropped support for Java 6.
   * [METAMODEL-178] - Added AggregateFunction and ScalarFunction interfaces. 
Changed FunctionType enum to be super-interface of those. Compatibility is 
retained but a recompile of code using FunctionType is needed.
+  * [METAMODEL-171] - Made integration tests for Cassandra module function 
properly in all environments.
  
  ### Apache MetaModel 4.3.6
  

Reply via email to