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/650e545f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/650e545f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/650e545f Branch: refs/heads/master Commit: 650e545f93c8d1fcdddbf9ef2503caf6285e99b5 Parents: 93e6a37 124e286 Author: Saminda Wijeratne <[email protected]> Authored: Fri May 23 11:08:54 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Fri May 23 11:08:54 2014 -0700 ---------------------------------------------------------------------- .../apache/airavata/api/server/AiravataAPIServer.java | 4 +++- .../org/apache/airavata/api/server/util/Constants.java | 1 + .../server/src/main/resources/airavata-server.properties | 4 +++- .../airavata/orchestrator/server/OrchestratorServer.java | 4 +++- .../org/apache/airavata/orchestrator/util/Constants.java | 1 + .../persistance/registry/jpa/impl/ProjectRegistry.java | 11 +++++++---- 6 files changed, 18 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
