szymonsztuka dc25fc28b7 Merge remote-tracking branch 'remotes/open/master' into corda/os-merge-20-09-2018 ...

# Conflicts:
#	core-deterministic/build.gradle
#	core/src/test/kotlin/net/corda/core/utilities/KotlinUtilsTest.kt
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/flows/AsymmetricCorDappsTests.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/KryoSerializationScheme.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt

2018-09-20 16:39:34 +01:00

..

capsule

Merge commit 'df4699c69abc8aab7e1e44b602c762212cbf93f6' into chrisr3-os-merge

2018-09-17 14:01:09 +01:00

dist

gradle magic to publish installer

2018-07-02 18:01:08 +01:00

lib

Integration tests in database mode - add Oracle 12.1 JDBC driver directly into libs dir (#1399)

2018-09-19 20:49:00 +01:00

src

Merge remote-tracking branch 'remotes/open/master' into corda/os-merge-20-09-2018

2018-09-20 16:39:34 +01:00

build.gradle

Integration tests in database mode - add Oracle 12.1 JDBC driver directly into libs dir (#1399)

2018-09-19 20:49:00 +01:00