Merge remote-tracking branch 'remotes/open/master' into merges/march-13-14-55

# Conflicts:
#	build.gradle
#	docs/source/_static/versions
#	docs/source/running-a-node.rst
This commit is contained in:
sollecitom
2018-03-13 15:02:58 +00:00
9 changed files with 91 additions and 30 deletions

View File

@ -1,8 +0,0 @@
package net.corda.core.serialization
/**
* Annotation indicating a constructor to be used to reconstruct instances of a class during deserialization.
*/
@Target(AnnotationTarget.CONSTRUCTOR)
@Retention(AnnotationRetention.RUNTIME)
annotation class ConstructorForDeserialization