josecoll 7a9364c8d5 Merge remote-tracking branch 'open/master' into colljos-merge-171117 ... # Conflicts: # .idea/compiler.xml # build.gradle # client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt # docs/source/changelog.rst # node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt # node/src/main/kotlin/net/corda/node/internal/StartedNode.kt # node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt # samples/network-visualiser/build.gradle # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt		2017-11-17 15:11:24 +00:00
..
demobench	Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106	2017-11-06 17:27:13 +00:00
explorer	Merge remote-tracking branch 'open/master' into colljos-merge-171117	2017-11-17 15:11:24 +00:00
graphs	[CORDA-682]: Claim Jigsaw module names (#1824)	2017-10-06 15:37:33 +01:00
loadtest	Revert "Introducing network parameters."	2017-11-17 10:04:38 +00:00