Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5bf7fce6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5bf7fce6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5bf7fce6 Branch: refs/heads/develop Commit: 5bf7fce661ff6e250828bc8668f7d347004cf1e3 Parents: 5f04191 970dc68 Author: Marcus Christie <[email protected]> Authored: Wed Oct 11 17:14:09 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Wed Oct 11 17:14:09 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/api/server/AiravataAPIServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
