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/cb6b7a83 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cb6b7a83 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cb6b7a83 Branch: refs/heads/master Commit: cb6b7a831ad3d23f5b6fda290911df96d40e616f Parents: 86d2b62 922686b Author: Saminda Wijeratne <[email protected]> Authored: Wed Mar 12 12:33:29 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Wed Mar 12 12:33:29 2014 -0400 ---------------------------------------------------------------------- .../src/main/resources/registry-derby.sql | 2 +- .../src/main/resources/registry-mysql.sql | 2 +- .../airavata/gfac/provider/impl/GSISSHProvider.java | 2 +- .../airavata/integration/WorkflowIntegrationTestBase.java | 6 +++--- .../src/test/resources/airavata-server.properties | 10 ++++------ .../src/test/resources/registry-derby.sql | 2 +- .../registry/jpa/model/DataTransferDetail.java | 7 ++++--- .../jpa/resources/DataTransferDetailResource.java | 10 +++++++--- .../persistance/registry/jpa/resources/Utils.java | 5 ++++- .../src/main/resources/registry-derby.sql | 2 +- .../src/main/resources/registry-mysql.sql | 2 +- .../src/test/resources/registry-derby.sql | 2 +- 12 files changed, 29 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
