Merge branch 'METAMODEL-1159-composite-query'

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

Branch: refs/heads/master
Commit: eca98519981ce14b34b6c6e89787c29c5440fb0f
Parents: 398e963 4278de9
Author: Kasper Sørensen <[email protected]>
Authored: Sat Nov 17 06:32:25 2018 -0800
Committer: Kasper Sørensen <[email protected]>
Committed: Sat Nov 17 06:32:25 2018 -0800

----------------------------------------------------------------------
 .../membrane/app/DataContextSupplier.java       |  48 ---
 .../federation/FederatedDataContextFactory.java |  92 +++++
 .../registry/AbstractDataSourceRegistry.java    |  45 +++
 .../app/registry/DataContextSupplier.java       |  74 ++++
 .../file/FileBasedDataSourceRegistry.java       |  17 +-
 .../registry/file/FileBasedTenantContext.java   |   3 +-
 .../memory/InMemoryDataSourceRegistry.java      |  16 +-
 .../registry/memory/InMemoryTenantContext.java  |   2 +-
 postman-tests/Membrane.postman_collection.json  | 351 +++++++++++++++----
 9 files changed, 508 insertions(+), 140 deletions(-)
----------------------------------------------------------------------


Reply via email to