Jonathan Locke e5f314ffbf Merge branch 'release/4' into jlocke/merge_4.1_20190827 ... Merged release/4 (Corda OS version 4.1) into a branch created from master (Corda OS version 4.3) Conflicts: build.gradle client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt common/logging/build.gradle common/logging/src/main/kotlin/net/corda/common/logging/CordaVersion.kt constants.properties core-tests/src/test/kotlin/net/corda/coretests/utilities/ProgressTrackerTest.kt core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt docs/source/api-contract-constraints.rst docs/source/api-stability-guarantees.rst docs/source/app-upgrade-notes.rst docs/source/changelog.rst docs/source/clientrpc.rst docs/source/conf.py docs/source/corda-network/UAT.md docs/source/getting-set-up.rst docs/source/network-builder.rst docs/source/upgrading-cordapps.rst docs/source/versioning.rst node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcReconnectTests.kt serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertyDescriptor.kt serialization/src/main/kotlin/net/corda/serialization/internal/model/LocalTypeInformationBuilder.kt tools/network-builder/src/main/resources/node-Dockerfile tools/network-builder/src/main/resources/notary-Dockerfile		2019-08-27 14:51:22 +01:00
..
src/main	Backport of CORDA-2998 fix network builder (#5265) (#5270)	2019-07-09 12:25:20 +01:00
build.gradle	Backport of CORDA-2998 fix network builder (#5265) (#5270)	2019-07-09 12:25:20 +01:00