Merge remote-tracking branch 'origin/master' into METAMODEL-173 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/59e98856 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/59e98856 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/59e98856
Branch: refs/heads/master Commit: 59e98856dade209ecb15e0493a58378f4fa2a98b Parents: f3e1783 8d0bb5f Author: Kasper Sørensen <[email protected]> Authored: Tue Aug 18 21:50:16 2015 +0200 Committer: Kasper Sørensen <[email protected]> Committed: Tue Aug 18 21:50:16 2015 +0200 ---------------------------------------------------------------------- .travis.yml | 1 - CHANGES.md | 4 ++ cassandra/pom.xml | 23 ----------- elasticsearch/pom.xml | 43 ++++---------------- .../ElasticSearchDataContextTest.java | 7 ---- pom.xml | 6 +-- 6 files changed, 16 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
