Shams Asari d6054e4b4f Merge branch 'master' into shams-master-merge-081217 ... # Conflicts: # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/DriverDSLImpl.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/RPCDriver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/internal/demorun/DemoRunner.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt		2017-12-11 10:23:16 +00:00
..
corda_dev_ca.cer	Add switchable HTTPS to Node web server	2016-08-30 13:07:40 +01:00
generalnodea.conf	Removed remaining references to networkMapService	2017-12-01 20:57:58 +00:00
generalnodeb.conf	[CORDA-446] Clean up other mentions of network map node and logic (#1974)	2017-11-01 14:25:48 +00:00
jolokia-access.xml	CORDA-822 - JMX Jolokia instrumentation (#2197)	2017-12-08 16:27:12 +00:00
log4j2.xml	[CORDA-760]: Propagate invocation context across the codebase. (#2016)	2017-11-15 14:58:43 +00:00
nameservernode.conf	Cleaned up notary configuration by introducing a notary config option.	2017-10-07 12:52:37 +01:00