You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/03 16:01:46 UTC
[30/50] [abbrv] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
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/632b76a3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/632b76a3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/632b76a3
Branch: refs/heads/master
Commit: 632b76a34aa1cdfebcb77e792e35fe75028a8add
Parents: 75edff6 1492fdc
Author: Suresh Marru <sm...@apache.org>
Authored: Wed Jul 12 15:32:47 2017 -0500
Committer: Suresh Marru <sm...@apache.org>
Committed: Wed Jul 12 15:32:47 2017 -0500
----------------------------------------------------------------------
.../production/pga_config/accord/vars.yml | 4 +-
.../production/pga_config/nanoshape/vars.yml | 2 +-
.../scigap/production/pga_config/utah/vars.yml | 2 +-
.../templates/airavata-server.properties.j2 | 5 ++
.../templates/airavata-server.properties.j2 | 5 ++
.../main/resources/airavata-server.properties | 7 +-
modules/db-event-manager/pom.xml | 2 +-
.../db/event/manager/DBEventManagerRunner.java | 67 +++++++++++++++++++-
modules/distribution/pom.xml | 5 ++
.../catalog/resources/WorkerResource.java | 52 +++++++++++----
.../RegistryServiceDBEventHandler.java | 7 +-
.../org/apache/airavata/server/ServerMain.java | 8 ++-
.../messaging/SharingServiceDBEventHandler.java | 7 +-
.../server/SharingRegistryServerHandler.java | 1 -
pom.xml | 1 +
15 files changed, 150 insertions(+), 25 deletions(-)
----------------------------------------------------------------------