Michele Sollecito 420b2ccd40 Merge branch 'master' into merges/08_11_2018_16_05 ...

# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/EnterpriseConfiguration.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt

2018-11-08 18:20:02 +00:00

..

capsule

Merge commit 'df4699c69abc8aab7e1e44b602c762212cbf93f6' into chrisr3-os-merge

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

dist

really disable building installer dist on OS X (#1547)

2018-11-07 18:16:51 +00: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 branch 'master' into merges/08_11_2018_16_05

2018-11-08 18:20:02 +00:00

build.gradle

Merge remote-tracking branch 'remotes/open/master' into merges/08_11_2018_16_05

2018-11-08 16:39:09 +00:00