josecoll eb3798da5e Merge remote-tracking branch 'open/master' into colljos-merge-160118		2018-01-16 12:13:49 +00:00
..
integration-test/kotlin/net/corda/traderdemo	Merge remote-tracking branch 'open/master' into colljos-merge-160118	2018-01-16 12:13:49 +00:00
main	More descriptive error message (#2295)	2017-12-28 09:12:06 +00:00
test/kotlin/net/corda/traderdemo	CORDA-912 Stop exposing internal node user, create user in testing infrastructu… (#2361)	2018-01-15 19:30:33 +00:00