Anthony Keenan 8d7aa5f590 Merge remote-tracking branch 'open/master' into anthony-os-merge-20180710 ...

# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/network-bootstrapper.rst
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/services/identity/IdentityServiceUtil.kt
#	node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt

2018-07-10 11:19:23 +01:00

..

src

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

2018-07-10 11:19:23 +01:00

build.gradle

Merge commit '8087f3c5d3c823a5fbda9a728f129b0925c1fddb' into chrisr3-os-merge

2018-06-12 14:11:27 +01:00