Merge remote-tracking branch 'open/master' into os-merge-2792716

2025-06-14 21:28:14 +00:00 · 2018-04-07 18:23:14 +01:00
parent 11af3992db 2792716157
commit 3fbfd0deeb
6 changed files with 127 additions and 16 deletions
--- a/docs/source/example-code/src/main/resources/example-network-map-node.conf
+++ b/docs/source/example-code/src/main/resources/example-network-map-node.conf
@ -1,4 +0,0 @@
-myLegalName : "O=Notary Service,OU=corda,L=London,C=GB"
-keyStorePassword : "cordacadevpass"
-trustStorePassword : "trustpass"
-p2pAddress : "my-network-map:10000"
--- a/docs/source/example-code/src/main/resources/example-node.conf
+++ b/docs/source/example-code/src/main/resources/example-node.conf
@ -18,4 +18,3 @@ rpcUsers : [
    { username=user1, password=letmein, permissions=[ StartFlow.net.corda.protocols.CashProtocol ] }
 ]
 devMode : true
-// certificateSigningService : "https://testnet.certificate.corda.net"