GitHub user Buuhuu opened a pull request:
https://github.com/apache/sling/pull/207
SLING-6652
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/Buuhuu/sling feature/SLING-6652-+-SLING-6658
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/sling/pull/207.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #207
----
commit ee46f4884373c434c614ce025b40f0a826045a3c
Author: Dirk Rudolph <[email protected]>
Date: 2017-03-17T07:47:45Z
SLING-6652:
- applied justinâs patch
commit ec8564eaf6cda06e025607f885fe48617b28d8b6
Author: Dirk Rudolph <[email protected]>
Date: 2017-03-17T07:51:30Z
SLING-6658:
- always reigster the model with its implType, even not specified as
adapter explicitly
commit 53f22ad86012b9f83f3b4163b12853e54b3b4680
Author: Dirk Rudolph <[email protected]>
Date: 2017-03-17T13:18:17Z
Merge remote-tracking branch 'origin/feature/SLING-6658' into
feature/SLING-6652-+-SLING-6658
commit 7d2b8250881804c77b6eb822126a75ab37b9e77f
Author: Dirk Rudolph <[email protected]>
Date: 2017-03-17T13:31:38Z
SLING-6652:
- moved logic collection Exporter annotations out of the nested for loops.
commit 29a1c8d4cc60fe205219e35f64f5ab03f6356fd2
Author: Dirk Rudolph <[email protected]>
Date: 2017-03-17T13:32:31Z
SLING-6652:
- instantiate accessor using concret implType instead of implicitly
assuming the first of the adapterTypes should be taken
commit e32d4d617f9d5f1443d5969bd18904dc4fae1984
Author: Dirk Rudolph <[email protected]>
Date: 2017-03-17T13:49:05Z
Merge remote-tracking branch 'origin/trunk2' into
feature/SLING-6652-+-SLING-6658
# Conflicts:
#
bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/ImplementsExtendsTest.java
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
