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/420a51ad Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/420a51ad Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/420a51ad Branch: refs/heads/master Commit: 420a51ad6a6a53ac9d0492d537325947c195490f Parents: c29aa94 449eb75 Author: shamrath <[email protected]> Authored: Wed May 13 15:57:43 2015 -0400 Committer: shamrath <[email protected]> Committed: Wed May 13 15:57:43 2015 -0400 ---------------------------------------------------------------------- modules/distribution/new-dist/pom.xml | 62 +------- .../main/assembly/airavata-common-component.xml | 100 +++++++++++++ .../src/main/assembly/api-server-assembly.xml | 147 +------------------ .../src/main/assembly/api-server-component.xml | 8 +- .../new-dist/src/main/assembly/src-assembly.xml | 2 +- modules/distribution/pom.xml | 2 +- 6 files changed, 113 insertions(+), 208 deletions(-) ----------------------------------------------------------------------
