Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/oodt
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/dc794944 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/dc794944 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/dc794944 Branch: refs/heads/master Commit: dc794944b7362d87821c42ae91de8c39df849de5 Parents: 1c49a9b f347506 Author: Imesha Sudasingha <imesha.sudasin...@gmail.com> Authored: Wed May 16 16:00:16 2018 +0530 Committer: Imesha Sudasingha <imesha.sudasin...@gmail.com> Committed: Wed May 16 16:00:16 2018 +0530 ---------------------------------------------------------------------- .../archetype-resources/distribution/pom.xml | 10 +-- .../maven-cas-install-plugin.iml.orig | 48 -------------- .../maven-cas-install-plugin.iml.rej | 70 -------------------- 3 files changed, 5 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
