CORDA-3193: Updated README.md. Note master branch no longer used
Updated the README.md file to provide more detail on the new branching strategy to be used going forward and why master will not be used.
Note that this is intended to be the final commit in the master branch of this repository. Master will not be used anymore -
instead, development work should be done against the appropriate release branch. Branches are named according to the following pattern:
release/os/{major version}.{minor version}
As of September 2019, all work that was previously targeted for the master branch should be rebased on the release/os/4.3 branch.
Please see the above mentioned README.md file for more detail.
* CORDA-3193: Updated README.md. Note master branch no longer used
Updated README.md to mention default branch tracking.
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
The Blob Writer is a small kotlin app that allows arbitrary things to be serialized and then those bytes written to a file, quite useful for working on non JVM parsing of such things.
Along a similar vein, add a schema dumper alongside the blob-inspector to highlight the contents of the header
