Shams Asari a59083ceb2 Merge remote-tracking branch 'open/master' into os-merge-020318 ...

# Conflicts:
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/Node.kt

2018-03-02 10:42:03 +00:00

..

kotlin/net/corda/testing

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

2018-03-02 10:42:03 +00:00

resources

Changed system and environmental variables to only be parsed as config if they're prefixed with "corda." e.g., to override "p2pPort" would now take a "corda.p2pPort" from system or environmental variables.

2018-03-01 16:37:15 +00:00