Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/962389c9 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/962389c9 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/962389c9 Branch: refs/heads/master Commit: 962389c91236f14e9c43b4d801fbb7bb29bc60b9 Parents: e53cba9 a34c0d9 Author: Suresh Marru <[email protected]> Authored: Tue Jul 8 13:54:51 2014 -0400 Committer: Suresh Marru <[email protected]> Committed: Tue Jul 8 13:54:51 2014 -0400 ---------------------------------------------------------------------- .../client/samples/CreateLaunchExperiment.java | 23 +++++++---- .../client/tools/DocumentCreatorNew.java | 42 ++++++++++++++++---- .../appcatalog/cpi/GwyResourceProfile.java | 2 + .../data/impl/GwyResourceProfileImpl.java | 19 +++++++++ .../airavata/gfac/core/cpi/BetterGfacImpl.java | 27 ++++++++----- .../airavata/integration/SimpleEchoIT.java | 4 +- 6 files changed, 91 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
