Shams Asari 71763ff1d3 Merge branch 'master' into shams-master-merge-291117 ... # Conflicts: # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/services/network/PersistentNetworkMapCache.kt # node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTests.kt # samples/notary-demo/src/main/kotlin/net/corda/notarydemo/BFTNotaryCordform.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt		2017-11-29 18:00:16 +00:00
..
demobench	Add X500 name constraints for non-organisation attributes (#2108)	2017-11-23 12:42:45 +00:00
explorer	Create a dedicated Log4J2 file for NodeExplorer and output logging configuration used. (#2142)	2017-11-28 17:51:30 +00:00
graphs	[CORDA-682]: Claim Jigsaw module names (#1824)	2017-10-06 15:37:33 +01:00
loadtest	Revert "Revert "Introducing network parameters.""	2017-11-21 15:05:24 +00:00