You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by sh...@apache.org on 2016/08/05 23:42:33 UTC

[6/6] airavata git commit: Merge branch 'master' into develop

Merge branch 'master' into develop


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

Branch: refs/heads/develop
Commit: f88859bf3de8b3b9924dcd7d3db12931d586b268
Parents: ab6c1de a4716a7
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Fri Aug 5 19:42:15 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Fri Aug 5 19:42:15 2016 -0400

----------------------------------------------------------------------
 .../catalog/impl/GwyResourceProfileImpl.java    |  9 ++++
 .../model/ComputeResourcePreference.java        | 43 +++++++++++++++++++
 .../ComputeHostPreferenceResource.java          | 45 ++++++++++++++++++++
 .../app/catalog/util/AppCatalogJPAUtils.java    |  4 ++
 .../util/AppCatalogThriftConversion.java        |  4 ++
 .../src/main/resources/appcatalog-derby.sql     |  4 ++
 .../src/main/resources/appcatalog-mysql.sql     |  4 ++
 7 files changed, 113 insertions(+)
----------------------------------------------------------------------