Shams Asari de9565b96a Merge remote-tracking branch 'open/master' into shams-os-merge-191217 ... # Conflicts: # core/src/main/kotlin/net/corda/core/node/services/NotaryService.kt # node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt # node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt # node/src/integration-test/kotlin/net/corda/services/messaging/P2PMessagingTest.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt		2017-12-19 23:44:07 +00:00
..
main	Merge remote-tracking branch 'open/master' into shams-os-merge-191217	2017-12-19 23:44:07 +00:00
test	Merge remote-tracking branch 'open/master' into colljos-os-merge-rc01	2017-12-18 10:24:38 +00:00