Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/88515820 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/88515820 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/88515820 Branch: refs/heads/develop Commit: 88515820221414173461a7b7ae3207afe3a9a621 Parents: fde02b8 bedf91c Author: scnakandala <[email protected]> Authored: Mon Jan 4 17:10:24 2016 -0500 Committer: scnakandala <[email protected]> Committed: Mon Jan 4 17:10:24 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 25 +++++++++++++++++++- .../impl/task/DefaultJobSubmissionTask.java | 15 +++++++----- .../src/main/resources/expcatalog-derby.sql | 12 +++++----- .../src/main/resources/expcatalog-mysql.sql | 14 +++++------ 4 files changed, 46 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
