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/92244d67 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/92244d67 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/92244d67 Branch: refs/heads/workflow-support Commit: 92244d67ee589207cf7ee45b367464338c25d368 Parents: e019c86 1e8331f Author: Suresh Marru <[email protected]> Authored: Sat Jul 12 18:23:29 2014 -0400 Committer: Suresh Marru <[email protected]> Committed: Sat Jul 12 18:23:29 2014 -0400 ---------------------------------------------------------------------- .../api/server/handler/AiravataServerHandler.java | 14 +++++++++++--- .../apache/airavata/gfac/core/monitor/MonitorID.java | 13 ++++++++++++- .../gfac/monitor/impl/pull/qstat/HPCPullMonitor.java | 10 ++++++++++ .../registry/jpa/impl/ProjectRegistry.java | 1 + 4 files changed, 34 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
