josecoll 4e42fff7d4 Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)		2017-12-13 12:34:06 +00:00
..
main	Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217	2017-12-13 11:02:58 +00:00
smoke-test/kotlin/net/corda/core	Merge Open Source into Enterprise	2017-12-05 17:35:54 +00:00
test	Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)	2017-12-13 12:34:06 +00:00