airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [3/3] airavata git commit: merge remote branch
Date Mon, 03 Apr 2017 17:50:24 GMT
merge remote branch


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

Branch: refs/heads/develop
Commit: 048a11babe3a078898eb723c6d3bd19a98a91af5
Parents: f0d8331 5100c07
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Mon Apr 3 13:50:15 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Mon Apr 3 13:50:15 2017 -0400

----------------------------------------------------------------------
 dev-tools/ansible/ansible.cfg                   |  2 +
 .../inventories/testing-0.17/files/airavata.jks | 76 ++++++++++++++++++++
 .../testing-0.17/files/airavata_sym.jks         | 30 ++++++++
 .../testing-0.17/group_vars/all/vars.yml        |  7 +-
 .../templates/airavata-server.properties.j2     |  6 +-
 .../ansible/roles/common/defaults/main.yml      |  3 +
 dev-tools/ansible/roles/common/tasks/main.yml   | 12 ++--
 .../templates/airavata-server.properties.j2     |  6 +-
 .../monitor/email/parser/LSFEmailParser.java    |  1 -
 .../catalog/impl/UsrResourceProfileImpl.java    |  4 +-
 .../model/UserComputeResourcePreference.java    |  6 +-
 .../model/UserComputeResourcePreferencePK.java  | 24 +++++--
 .../catalog/model/UserStoragePreference.java    |  6 +-
 .../catalog/model/UserStoragePreferencePK.java  | 22 +++++-
 .../UserComputeHostPreferenceResource.java      | 10 ++-
 .../UserStoragePreferenceResource.java          | 14 ++--
 .../main/resources/workflowcatalog-mysql.sql    |  3 +-
 .../registry/cpi/CompositeIdentifier.java       | 12 +++-
 .../DeltaScripts/appCatalog_schema_delta.sql    |  6 +-
 19 files changed, 208 insertions(+), 42 deletions(-)
----------------------------------------------------------------------



Mime
View raw message