Shams Asari c71ef3139b Merge remote-tracking branch 'open/master' into shams-os-merge-120118 ... # Conflicts: # core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkMap.kt # node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt # node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt # testing/test-utils/src/main/kotlin/net/corda/testing/internal/vault/DummyDealStateSchemaV1.kt		2018-01-12 08:06:44 +00:00
..
integration-test/kotlin/net/corda/testing	Moved IntegrationTest class into internal package	2018-01-04 22:08:16 +00:00
main/kotlin/net/corda/testing	Merge remote-tracking branch 'open/master' into shams-os-merge-120118	2018-01-12 08:06:44 +00:00
test	CORDA-876 MockNetwork no longer leaks serialization env if init fails (#2272)	2017-12-18 17:09:24 +00:00