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/2c4044cd Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2c4044cd Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2c4044cd Branch: refs/heads/master Commit: 2c4044cd63fa42c61a6f04d87b54ba26e3c40959 Parents: 12a4800 39a0365 Author: Shameera Rathanyaka <[email protected]> Authored: Fri Sep 4 16:29:07 2015 -0400 Committer: Shameera Rathanyaka <[email protected]> Committed: Fri Sep 4 16:29:07 2015 -0400 ---------------------------------------------------------------------- .../catalog/resources/ExperimentResource.java | 2 - .../catalog/resources/GatewayResource.java | 2 - .../catalog/resources/JobResource.java | 2 - .../catalog/resources/JobStatusResource.java | 6 +-- .../catalog/resources/ProcessErrorResource.java | 6 +-- .../catalog/resources/ProcessInputResource.java | 4 +- .../resources/ProcessOutputResource.java | 4 +- .../catalog/resources/ProcessResource.java | 2 - .../ProcessResourceScheduleResource.java | 6 +-- .../resources/ProcessStatusResource.java | 6 +-- .../catalog/resources/ProjectResource.java | 2 + .../catalog/resources/TaskResource.java | 2 - .../src/main/resources/expcatalog-derby.sql | 2 +- .../src/main/resources/expcatalog-mysql.sql | 2 +- .../src/test/resources/expcatalog-derby.sql | 40 +++++++++++++++----- 15 files changed, 51 insertions(+), 37 deletions(-) ----------------------------------------------------------------------
