You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/01/12 23:04:22 UTC
[11/50] [abbrv] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/bedf91c1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bedf91c1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bedf91c1
Branch: refs/heads/data-manager
Commit: bedf91c1a01166fd5b04c0d99c9a0043026b85cd
Parents: 4409f99 2762670
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Jan 4 16:01:39 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Jan 4 16:01:39 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 45 +++++++++---
.../api/server/util/RegistryInitUtil.java | 2 +-
.../manager/core/MetadataCatalogService.java | 76 ++++++++++++++++++++
.../experiment/catalog/ExpCatResourceUtils.java | 9 +--
.../catalog/impl/ExperimentCatalogImpl.java | 4 +-
.../catalog/impl/ExperimentRegistry.java | 2 +-
.../catalog/impl/ProjectRegistry.java | 2 +-
.../catalog/resources/WorkerResource.java | 2 +-
.../src/main/resources/expcatalog-derby.sql | 12 ++--
.../src/main/resources/expcatalog-mysql.sql | 17 ++---
10 files changed, 136 insertions(+), 35 deletions(-)
----------------------------------------------------------------------