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/34b06cc9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/34b06cc9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/34b06cc9 Branch: refs/heads/master Commit: 34b06cc9999d747cd21eee356049f5dbc47dc45e Parents: fcbda21 fd557d8 Author: Lahiru Gunathilake <[email protected]> Authored: Mon Mar 9 17:03:46 2015 -0400 Committer: Lahiru Gunathilake <[email protected]> Committed: Mon Mar 9 17:03:46 2015 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 43 ++++++++++++++++++++ .../data/impl/GwyResourceProfileImpl.java | 2 +- .../integration/tools/DocumentCreatorNew.java | 7 +++- 3 files changed, 49 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
