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
..
integration-test/kotlin/net/corda/finance/flows	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-12 11:22:57 +00:00
test	CORDA-716 Fix split packages in testing (#2232)	2017-12-12 19:37:01 +00:00