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 2016/10/26 14:22:45 UTC

[2/2] airavata git commit: Merging PR61 and 65 into 63

Merging PR61 and 65 into 63


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

Branch: refs/heads/develop
Commit: 9890991475a6e5a129503d41e7e0be3a9715be3e
Parents: 48ea4a0 1d710c9
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Oct 26 10:22:04 2016 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Oct 26 10:22:04 2016 -0400

----------------------------------------------------------------------
 .../UserResourceProfile.java                    | 116 ++++++++++++++++++-
 .../catalog/impl/UsrResourceProfileImpl.java    |   4 +-
 .../UserStoragePreferenceResource.java          |   4 +-
 .../util/AppCatalogThriftConversion.java        |   5 +
 .../app/catalog/UserResourceProfileTest.java    |  31 ++++-
 .../user_resource_profile_model.thrift          |   6 +-
 6 files changed, 155 insertions(+), 11 deletions(-)
----------------------------------------------------------------------