Merge remote-tracking branch 'open/master' into andrius/os-merge

This commit is contained in:
Andrius Dagys
2018-05-03 13:37:39 +01:00
92 changed files with 1233 additions and 1102 deletions

View File

@ -11,7 +11,7 @@
package net.corda.testing.node.internal
import net.corda.client.mock.Generator
import net.corda.client.rpc.internal.KryoClientSerializationScheme
import net.corda.client.rpc.internal.serialization.kryo.KryoClientSerializationScheme
import net.corda.client.rpc.internal.RPCClient
import net.corda.client.rpc.internal.CordaRPCClientConfigurationImpl
import net.corda.core.concurrent.CordaFuture