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/7e022eff Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7e022eff Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7e022eff Branch: refs/heads/master Commit: 7e022eff0fa88ebcd27e33cb6fb5a5939b327fdd Parents: 3eac761 d233abd Author: Saminda Wijeratne <[email protected]> Authored: Fri May 23 11:32:26 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Fri May 23 11:32:26 2014 -0700 ---------------------------------------------------------------------- modules/configuration/server/src/main/resources/gfac-config.xml | 4 ++-- modules/gfac/gfac-ssh/src/test/resources/gfac-config.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
