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/8cbb2d1f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8cbb2d1f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8cbb2d1f Branch: refs/heads/gfac_appcatalog_int Commit: 8cbb2d1fc4187f47e24f2451d9f6bbe300e33fc9 Parents: f712ec1 b1226d5 Author: lahiru <[email protected]> Authored: Fri Nov 7 12:25:44 2014 -0500 Committer: lahiru <[email protected]> Committed: Fri Nov 7 12:25:44 2014 -0500 ---------------------------------------------------------------------- .../server/src/main/resources/airavata-server.properties | 4 +--- .../server/src/main/resources/bin/airavata-server.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
