You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/03/03 22:47:25 UTC
[3/3] airavata git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c073c6a5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c073c6a5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c073c6a5
Branch: refs/heads/master
Commit: c073c6a5d9d6d6719bd6e0574aec826b879f4469
Parents: 0f2c6ff 672d13e
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Mar 3 16:47:20 2015 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Mar 3 16:47:20 2015 -0500
----------------------------------------------------------------------
.../data/impl/GwyResourceProfileImpl.java | 2 +
.../data/model/ApplicationDeployment.java | 10 +
.../data/model/ApplicationInterface.java | 10 +
.../data/model/ComputeResourcePreference.java | 10 +
.../catalog/data/model/Workflow.java | 10 +
.../data/resources/AppDeploymentResource.java | 11 +
.../data/resources/AppInterfaceResource.java | 11 +
.../ComputeHostPreferenceResource.java | 11 +
.../data/resources/WorkflowResource.java | 10 +
.../catalog/data/util/AppCatalogJPAUtils.java | 4 +
.../data/util/AppCatalogThriftConversion.java | 1 +
.../src/main/resources/appcatalog-derby.sql | 208 ++++++++++---------
.../src/main/resources/appcatalog-mysql.sql | 204 +++++++++---------
.../src/test/resources/appcatalog-derby.sql | 208 ++++++++++---------
14 files changed, 405 insertions(+), 305 deletions(-)
----------------------------------------------------------------------