airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [4/4] airavata git commit: Merge remote-tracking branch 'origin/develop' into develop
Date Wed, 24 Feb 2016 17:02:51 GMT
Merge remote-tracking branch 'origin/develop' into develop


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

Branch: refs/heads/develop
Commit: b09ce0cf9a4c59e1a17d21b9deeec76d6e0a7112
Parents: 48e2593 f22acb8
Author: smarru <smarru@apache.org>
Authored: Wed Feb 24 12:02:42 2016 -0500
Committer: smarru <smarru@apache.org>
Committed: Wed Feb 24 12:02:42 2016 -0500

----------------------------------------------------------------------
 .../airavata/api/server/AiravataAPIServer.java  |  10 +-
 .../server/util/CredentialStoreInitUtil.java    | 156 +++++++++++++++++++
 .../scripts/credential-store-h2.sql             |  42 -----
 .../scripts/credential-store-mysql.sql          |  38 -----
 .../src/main/resources/credstore-derby.sql      |  39 +++++
 .../src/main/resources/credstore-mysql.sql      |  39 +++++
 .../src/main/resources/expcatalog-derby.sql     |  21 +--
 .../src/main/resources/expcatalog-mysql.sql     |  21 +--
 8 files changed, 242 insertions(+), 124 deletions(-)
----------------------------------------------------------------------



Mime
View raw message