Skip to content

Commit

Permalink
Merge pull request #2032 from geertsmichael/master
Browse files Browse the repository at this point in the history
* Fixing /var/acs-commons filter.xml (removed double rep:policy, moved /var/workflow filter, added on-deploy-scripts-status)
  • Loading branch information
HitmanInWis authored Sep 27, 2019
2 parents bc9bda1 + 9f349ad commit 0c09d6a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
- #2045 added oakpal configuration to ui.content to verify that rep:policy nodes are effectively applied, and that existing config pages are not deleted

### Fixed
- #2032 - Fixed filter.xml on /var/acs-commons
- #2048 - Fixed ui.apps ACE import by setting acHandling property to "merge"

## [4.3.2] - 2019-08-29
Expand Down
4 changes: 2 additions & 2 deletions ui.content/src/main/content/META-INF/vault/filter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
pattern="/etc/acs-commons/reports(.*)?"
mode="merge"/>
<include pattern="/var/acs-commons/httpcache"/>
<include pattern="/var/acs-commons/rep:policy"/>
<include pattern="/var/workflow/instances/rep:policy"/>
<include pattern="/var/acs-commons/on-deploy-scripts-status"/>
</filter>
<filter root="/var/workflow/instances/rep:policy"/>
</workspaceFilter>

0 comments on commit 0c09d6a

Please sign in to comment.