| commit | 2eef4f513dc9c9345bb13533c2705239671acae2 | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Mon Jun 08 14:07:56 2015 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Mon Jun 08 14:07:56 2015 +0000 |
| tree | 27088a0765f5b587bb1a771185091872ed621e8b | |
| parent | 4455df27fa660c9ad533cb6956f742ed2188ebdc [diff] |
SLING-4126 : Provide a mechanism to merge configurations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1684190 13f79535-47bb-0310-9956-ffa450edef68