ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-22 17:09:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb

Browse Source
This commit is contained in:
Andras Slemmer
2018-02-20 15:52:09 +00:00
parent d28c781597 979aef1308
commit 25263c20c7
318 changed files with 5853 additions and 4008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webserver/src/main/kotlin/net/corda/webserver/WebServerConfig.kt
View File

@ -13,7 +13,6 @@ import java.nio.file.Path
class WebServerConfig(override val baseDirectory: Path, val config: Config) : NodeSSLConfiguration {
override val keyStorePassword: String by config
override val trustStorePassword: String by config
val exportJMXto: String get() = "http"
val useHTTPS: Boolean by config
val myLegalName: String by config
val rpcAddress: NetworkHostAndPort by lazy {