merging with origin master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/698a21ff Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/698a21ff Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/698a21ff Branch: refs/heads/develop Commit: 698a21ffceeb456681de565adb4691a260c5ec2a Parents: c82a535 2d8e350 Author: scnakandala <[email protected]> Authored: Wed Dec 23 01:43:46 2015 -0500 Committer: scnakandala <[email protected]> Committed: Wed Dec 23 01:43:46 2015 -0500 ---------------------------------------------------------------------- .../apache/airavata/client/samples/CreateLaunchExperiment.java | 2 +- .../org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java | 1 + .../registry/core/experiment/catalog/resources/JobResource.java | 3 ++- .../core/experiment/catalog/resources/ProcessResource.java | 3 ++- .../registry/core/experiment/catalog/resources/TaskResource.java | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
