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
..
jackson	Introduce contextLogger (#2085)	2017-11-20 11:31:08 +00:00
jfx	Renamed n.c.nodeapi.config to n.c.nodeapi.internal.config as that config code is not public API. For the same reason, also moved User into the same internal package.	2017-12-03 17:20:30 +00:00
mock	Reformat files in client	2017-10-09 15:26:39 +01:00
rpc	Merge branch 'master' into shams-master-merge-081217	2017-12-11 10:23:16 +00:00