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/2d07714d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2d07714d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2d07714d Branch: refs/heads/master Commit: 2d07714d23cbfa8afda547db60cd5e161e5ad87e Parents: 50af1b0 f452dab Author: marpierc <[email protected]> Authored: Thu Mar 6 10:47:29 2014 -0500 Committer: marpierc <[email protected]> Committed: Thu Mar 6 10:47:29 2014 -0500 ---------------------------------------------------------------------- modules/commons/pom.xml | 2 +- modules/distribution/airavata-client/pom.xml | 4 ++-- .../airavata-client/src/main/assembly/bin-assembly.xml | 4 ++-- modules/distribution/pom.xml | 4 ++-- modules/distribution/release/pom.xml | 4 ++-- .../orchestrator/client/sample/OrchestratorClientSample.java | 4 ++-- modules/workflow-model/pom.xml | 4 ++-- pom.xml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
