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

..

capsule

ENT-1871 Rebrand R3Corda to Corda Enterprise (#907)

2018-06-02 10:47:31 +01:00

dist

gradle magic to publish installer

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

lib

Oracle 11xe and 12c database compatibility (#206)

2018-01-29 18:35:58 +00:00

src

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

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

build.gradle

ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)

2018-06-20 15:38:48 +01:00