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/0edfa860 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0edfa860 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0edfa860 Branch: refs/heads/master Commit: 0edfa860a57c9c178f42384aff0879830d3752e9 Parents: c2d006e ab1ab84 Author: lahiru <[email protected]> Authored: Tue Mar 18 00:41:37 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue Mar 18 00:41:37 2014 -0400 ---------------------------------------------------------------------- NOTICE | 1 - .../airavata-php-sdk/client-samples/GetAiravataVersion.php | 3 ++- airavata-api/generate-thrift-files.sh | 4 ++-- modules/distribution/airavata-client/src/main/resources/NOTICE | 2 +- modules/distribution/airavata-server/src/main/resources/NOTICE | 2 +- modules/distribution/xbaya-gui/src/main/resources/NOTICE | 2 +- modules/distribution/xbaya-gui/src/main/resources/jnlp/NOTICE | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
