Matthew Nesbit 2b55a8f67e Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411 ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/main/resources/reference.conf # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt		2018-04-11 14:00:56 +01:00
..
capsule	Merge remote-tracking branch 'open/master' into merge/tudor-26-03	2018-03-26 14:07:28 +01:00
lib	Oracle 11xe and 12c database compatibility (#206)	2018-01-29 18:35:58 +00:00
src	Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411	2018-04-11 14:00:56 +01:00
build.gradle	Remove logback SLF4J backend from node tests. (#659)	2018-03-30 23:52:53 +01:00