Jose Coll 7d080c39df Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor ... # Conflicts: # core/src/main/kotlin/com/r3corda/core/contracts/Structures.kt # node/src/test/kotlin/com/r3corda/node/services/NodeSchedulerServiceTest.kt Fixed failing CommercialPaper test (caused by re-use of same database transaction context for vault across two different transaction participants)		2016-10-27 12:56:08 +01:00
..
src	Merge remote-tracking branch 'remotes/origin/master' into colljos-vault-code-clean-up-refactor	2016-10-27 12:56:08 +01:00
build.gradle	Replaced maven plugin with the newer, simpler, maven-publish plugin and added an alias.	2016-10-11 13:05:46 +01:00