GitHub user przeemek opened a pull request:
https://github.com/apache/avro/pull/240
AVRO-1658: Java: Add reflection annotation @AvroDoc.
This is a follow up of Pull-Request https://github.com/apache/avro/pull/189,
where all merge conflicts are resolved and the feature is ready for
review/merge
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/przeemek/avro AVRO-1658
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/avro/pull/240.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 #240
----
commit c0f1aa0ec738efcde4f48d48929f1c3d24451acf
Author: Evan McClain <[email protected]>
Date: 2016-07-30T23:47:50Z
AVRO-1658: Java: Add reflection annotation @AvroDoc.
@AvroMeta can be used for other keys, but doc is passed into the field's
constructor.
commit e86c002947f3b6463d238e10de85d259a4a52c54
Author: Evan McClain <[email protected]>
Date: 2017-04-05T02:54:23Z
Merge remote-tracking branch 'origin/master' into AVRO-1658
commit deade58297827c4cb467d5be441607cfa1d76c69
Author: Evan McClain <[email protected]>
Date: 2016-07-30T23:47:50Z
AVRO-1658: Java: Add reflection annotation @AvroDoc.
@AvroMeta can be used for other keys, but doc is passed into the field's
constructor.
commit f672635fce9ee8f68fe0da90e61c9b65f70c1fde
Author: przwik <[email protected]>
Date: 2017-08-17T08:40:29Z
Merge remote-tracking branch 'origin/AVRO-1658' into AVRO-1658-c
Conflicts:
lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflect.java
commit 1c597512eb2fedc25059349f6d4cc3748299edd1
Author: przwik <[email protected]>
Date: 2017-08-17T08:43:24Z
AVRO-1658 - resolve merge conflicts
----
---
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.
---
