Merge branch 'mnesbit-cor-249-serviceloader-for-web-apis' of https://bitbucket.org/R3-CEV/r3prototyping into mnesbit-cor-249-serviceloader-for-web-apis

Browse Source

# Conflicts:
#	core/src/main/kotlin/com/r3corda/core/node/CordaPluginRegistry.kt
#	core/src/main/kotlin/com/r3corda/core/node/ServiceHub.kt
#	node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/com/r3corda/node/services/api/ServiceHubInternal.kt
#	src/main/kotlin/com/r3corda/demos/IRSDemo.kt
#	src/main/kotlin/com/r3corda/demos/api/InterestRateSwapAPI.kt
#	src/main/kotlin/com/r3corda/demos/protocols/ExitServerProtocol.kt

...

This commit is contained in:

Matthew Nesbit 2016-07-07 12:20:51 +01:00

parent 92aeb74c19 99fe3dfe75

commit 6c55034178

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available