Shams Asari 4984e92e31 Merge branch 'os-merge-point' into os-merge-shams ...

# Conflicts:
#	build.gradle
#	core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt
#	core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
#	docs/source/api-persistence.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/BridgeControlListener.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
#	settings.gradle
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt

2018-11-14 18:13:01 +00:00

..

src

Merge branch 'os-merge-point' into os-merge-shams

2018-11-14 18:13:01 +00:00

build.gradle

Ent-2570 Replace caffeine jitpack dependency (#1564)

2018-11-14 13:28:34 +00:00