[5/6] metamodel git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/metamodel

[kaspersor]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/metamodel


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

Branch: refs/heads/master
Commit: 973a069d54f925a45c4db23e782901afd63e64bc
Parents: 08e3a8f d43e907
Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
Authored: Wed Jun 17 21:25:31 2015 +0200
Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com>
Committed: Wed Jun 17 21:25:31 2015 +0200

----------------------------------------------------------------------
 CHANGES.md                                      |  1 +
 .../cassandra/CassandraDataContext.java         |  1 +
 .../metamodel/cassandra/CassandraUtils.java     |  2 +
 .../cassandra/CassandraDataContextTest.java     | 44 +++++++++++++++++---
 4 files changed, 43 insertions(+), 5 deletions(-)
----------------------------------------------------------------------