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
..
All_tests__Unit___Integration_.xml	Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.	2016-09-12 15:17:54 +01:00
BankOfCordaDriverKt___Issue_Web.xml	Removed unnecessary calls to MockNetwork.runNetwork (b/c there is no more P2P node registration) and removed redundant entries in cordappPackages	2017-11-06 21:28:20 +00:00
BankOfCordaDriverKt___Run_Stack.xml	Removed unnecessary calls to MockNetwork.runNetwork (b/c there is no more P2P node registration) and removed redundant entries in cordappPackages	2017-11-06 21:28:20 +00:00
Clean___Install.xml	Renamed publishToMavenLocal to install in run configs.	2016-11-04 10:37:38 +00:00
Clean.xml	Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.	2016-09-12 15:17:54 +01:00
CordaPlugin.xml	Corda intellij Plugin (#3)	2017-06-19 16:41:28 +01:00
Explorer___demo_nodes__flow_triage_.xml	Add simulation with broken flows. Refactor of simulation code.	2017-06-12 17:37:39 +01:00
Explorer___demo_nodes__simulation_.xml	Removed unnecessary calls to MockNetwork.runNetwork (b/c there is no more P2P node registration) and removed redundant entries in cordappPackages	2017-11-06 21:28:20 +00:00
Explorer___demo_nodes.xml	Removed unnecessary calls to MockNetwork.runNetwork (b/c there is no more P2P node registration) and removed redundant entries in cordappPackages	2017-11-06 21:28:20 +00:00
Explorer___GUI.xml	CORDA-611: Improve documentation for Node Explorer (#1615)	2017-09-22 17:36:03 +01:00
Install.xml	Renamed publishToMavenLocal to install in run configs.	2016-11-04 10:37:38 +00:00
Integration_tests.xml	Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.	2016-09-12 15:17:54 +01:00
Unit_tests.xml	Remove non-gradle "All tests" as seems to hang and add several Gradle based run configurations.	2016-09-12 15:17:54 +01:00