Repository: falcon Updated Branches: refs/heads/master 68c582003 -> 5a55baed3
FALCON-1541 Bundle deploy.properties while packaging falcon (Pragya Mittal) Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/5a55baed Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/5a55baed Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/5a55baed Branch: refs/heads/master Commit: 5a55baed34084d515ff911f6a25e251fad69534a Parents: 68c5820 Author: Pallavi Rao <[email protected]> Authored: Tue Oct 20 09:51:41 2015 +0530 Committer: Pallavi Rao <[email protected]> Committed: Tue Oct 20 09:51:41 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ webapp/pom.xml | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/5a55baed/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e92c81e..bc4fdf5 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -69,7 +69,10 @@ Trunk (Unreleased) FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao) BUG FIXES + FALCON-1541 Bundle deploy.properties while packaging falcon (Pragya Mittal via Pallavi Rao) + FALCON-1530 SLAMonitoring API is not honouring delete feature(Ajay Yadava). + FALCON-1532 Incorrect documentation in SLA monitoring(Pragya Mittal via Ajay Yadava) FALCON-1466 Flaky unit tests in Proxy user feature(Sowmya Ramesh) http://git-wip-us.apache.org/repos/asf/falcon/blob/5a55baed/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index e63aa44..da12d3a 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -41,8 +41,7 @@ <artifactId>maven-war-plugin</artifactId> <version>2.4</version> <configuration> - <packagingExcludes>WEB-INF/classes/deploy.properties</packagingExcludes> - <packagingExcludes>docs/downloads.html</packagingExcludes> + <packagingExcludes>WEB-INF/classes/deploy.properties,docs/downloads.html</packagingExcludes> <webResources> <resource> <directory>../falcon-ui/dist</directory>
