Andrzej Cichocki f3c5ae2ff6 Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise ... # Conflicts: # docs/source/changelog.rst # node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt		2018-01-18 16:48:05 +00:00
..
integration-test	Merge remote-tracking branch 'open/master' into colljos-merge-160118	2018-01-16 12:13:49 +00:00
main/kotlin/net/corda/client/rpc	Rename the inbox (#2360)	2018-01-17 16:06:31 +00:00
smoke-test	[ENT-1281]: Disable database.runMigration by default and enforce database version on startup. (#264)	2018-01-10 11:32:24 +00:00
test/kotlin/net/corda/client/rpc	Merge remote-tracking branch 'open/master' into colljos-merge-160118	2018-01-16 12:13:49 +00:00