| commit | 4455df27fa660c9ad533cb6956f742ed2188ebdc | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Mon Jun 08 13:45:31 2015 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Mon Jun 08 13:45:31 2015 +0000 |
| tree | 6147bbfcf6dda49286e768f40705bb3ab14855bd | |
| parent | ae1b748b5ad00f2ca90b78c1fea44a0324c798d0 [diff] |
SLING-4126 : Provide a mechanism to merge configurations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684183 13f79535-47bb-0310-9956-ffa450edef68