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/e2f03a1b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e2f03a1b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e2f03a1b Branch: refs/heads/workflow-support Commit: e2f03a1b85cd5cd92245e3613dbe0be20ba190b1 Parents: f4b384b cc0bc99 Author: Saminda Wijeratne <[email protected]> Authored: Sun Jul 13 22:21:10 2014 -0400 Committer: Saminda Wijeratne <[email protected]> Committed: Sun Jul 13 22:21:10 2014 -0400 ---------------------------------------------------------------------- .../src/main/assembly/bin-assembly.xml | 3 +- .../airavata-php-sdk/src/main/resources/INSTALL | 31 - .../airavata-php-sdk/src/main/resources/LICENSE | 1866 ------------------ .../airavata-php-sdk/src/main/resources/NOTICE | 160 +- .../conf/airavata-client-properties.ini | 2 +- 5 files changed, 4 insertions(+), 2058 deletions(-) ----------------------------------------------------------------------
