5469e41458
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180924-1
...
# Conflicts:
# core/src/main/kotlin/net/corda/core/internal/NamedCache.kt
# docs/source/index.rst
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessageDeduplicator.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt
2018-09-24 10:13:01 +01:00
7159dfcb61
CORDA-1787 Bring threat model into the docsite ( #3817 )
...
* CORDA-1787 bring threat model into docs site
* CORDA-1787 updating with full text
* CORDA-1787 update/fix typos
* CORDA-1787 update threat model with PR feedback
* CORDA-1787 fix typos
* CORDA-1787 move threat model into design section
* CORDA-1787 update formatting using pure markdown
2018-09-21 18:48:47 +01:00
b8a4b68495
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180906
...
# Conflicts:
# docs/source/contributing-index.rst
# docs/source/contributing.rst
# docs/source/running-a-node.rst
# node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt
# node/src/main/kotlin/net/corda/node/Corda.kt
# node/src/main/kotlin/net/corda/node/NodeArgsParser.kt
# node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
2018-09-06 11:20:45 +01:00
ce65a58c7c
CorDapp minimum and target version design doc. ( #3798 )
2018-09-05 11:12:35 +01:00
b98f91ee61
Merge remote-tracking branch 'remotes/origin/master' into feature/ENT-2253-NonStop-changes
...
# Conflicts:
# node/src/main/resources/migration/node-info.changelog-master.xml
# node/src/main/resources/migration/node-info.changelog-v3.xml
2018-08-30 15:51:38 +01:00
f061235cc8
Resolve merge conflict
2018-08-30 10:47:56 +01:00
12707c8df0
Signature constraints design doc: address review comments from Jose.
2018-08-29 16:32:06 +02:00
63ebc394bf
Update docs to reflect constraint implementation ( #3852 )
2018-08-28 12:05:54 +01:00
0045fe24fd
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180821-1
...
# Conflicts:
# docs/source/index.rst
2018-08-21 09:37:56 +01:00
e8a1564429
Add a design doc for signature constraints.
2018-08-17 16:09:46 +02:00
bb7d33380f
Merge remote-tracking branch 'open/master' into kat-merge-27072018
...
Conflicts:
core/src/main/kotlin/net/corda/core/internal/notary/NotaryServiceFlow.kt
core/src/main/kotlin/net/corda/core/internal/notary/TrustedAuthorityNotaryService.kt
docs/source/blob-inspector.rst
docs/source/release-notes.rst
docs/source/upgrade-notes.rst
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
2018-07-27 16:09:26 +01:00
8207ac3222
CORDA-1332 Reference input states ( #3525 )
...
* * First commit for reference input states feature.
* Added docs.
* Added additional test.
* Fixed whitespace.
* Rebased to master.
* Updated Raft and persistent notary implementations.
* Updated changelog.
* Updated topo sort to handle reference states.
* Stubbed out with referenced states flow.
* Added WithReferencedStatesFlow.
* Added Tests for WithReferencedStatesFlow.
* Added ReferenceState type.
* Rebased to latest version of master.
* Added better comments.
* Updated unit test.
* Added comment to explain a little hack.
* Fixed broken contract upgrade RPC test.
* Added minimum platform version check.
* Updated mock network so that notary nodes inherit the platform version set by the network's minimum platform version.
* References states can now only be used when minimum platform version >= 4.
* Created a new file to hold async operations as "WaitForStatesToUpdate" is broadly reusable.
* Refactored WithReferenceStatesFlow
* Updated javadoc for WaitForStatesToUpdate aysnc operation.
* Added network parameters property to InternalMockNetwork.
* Added min platform version capability to mock services.
* Removed erroneous chars from file.
* Made async operation internal and now call it from FlowLogic.
* Moved some transaction checking code around.
* Removed serializable annotation from referenced state and ref.
* Added reference states design doc.
* Added missing KDocs.
* Updated with reference states flow to handle consecutive update races.
* Made platform version info an inheritable thread local.
* Fixed various typos.
* Updated docs.
* Fixed race.
* Removed min platform version checks as API needs more thought.
* Added deprecation to method and supressed warnings.
* Renamed WaitForStatesToUpdate to WaitForStateConsumption.
* Fixed race in WaitForStateConsumption.
* Addressed PR comments and updated comments / KDocs.
* Reverse vault bugfixes.
* * Vault bug fixes.
* * Fixed broken test.
* Moved WaitForStateConsumption to internal package.
2018-07-25 14:06:56 +01:00
60b21e6f70
Move enterprise only docs out of docsite
2018-07-10 17:26:39 +01:00
88f327c7c2
Remove some unlinked docs
2018-07-10 17:25:04 +01:00
3203bdae97
Merge from O/S
2018-07-05 19:09:25 +01:00
123a2af5e0
Bridge to Firewall renames
...
More renaming
Update diagrams
Update changelog to point out breaking change fo the rename
Address Richard's PR comments
2018-07-05 15:20:28 +01:00
df198acf59
Fixing md formatting sphinixification issues ( #3510 )
2018-07-05 09:40:36 +01:00
d060e95834
Merge OS -> ENT up to e00c7706c3
2018-06-26 10:02:33 +01:00
9be4c5dca4
CORDA-1567 Remove all traces of the out-of-process verifier ( #3424 )
2018-06-25 13:01:33 +01:00
8b3a5432cb
Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge
2018-06-23 00:06:11 +01:00
3125ec9f73
[ENT-1955] Documentation fixes ( #3417 )
2018-06-21 16:57:30 +01:00
5a6af7f8ce
Merge remote-tracking branch 'open/master' into kostas-merge-14_06_2018
2018-06-14 14:43:44 +01:00
c15fde242f
Adds header of SGX design doc subheaders don't spill ( #3366 )
2018-06-14 13:46:20 +01:00
319953ba41
Merge commit '8087f3c5d3c823a5fbda9a728f129b0925c1fddb' into chrisr3-os-merge
2018-06-12 14:11:27 +01:00
6661ee8a3e
Add doc
2018-06-07 17:08:20 +01:00
d13cca49ec
ENT-1959: add a default value for mutualExclusionConfiguration.machineName ( #877 )
...
* ENT-1959: add a default value for mutualExclusionConfiguration.machineName
* ENT-1959: update docs
* ENT-1959: update docs, remove machineName from default conf, add unit test
2018-05-25 11:13:53 +01:00
210a0bc9a5
Merge branch 'master' into os-merge-2907250
2018-05-21 11:26:23 +01:00
152848730d
Merge remote-tracking branch 'open/master' into os-merge-2907250
...
# Conflicts:
# build.gradle
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# node-api/build.gradle
# node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/custom/StringBufferSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/AllButBlacklisted.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/AttachmentsClassLoader.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/DefaultWhitelist.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/GeneratedAttachment.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/OrdinalIO.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializationFormat.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializationScheme.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SerializeAsTokenContextImpl.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/SharedContexts.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/UseCaseAwareness.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPDescriptorRegistry.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPPrimitiveSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializerFactories.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ArraySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CollectionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CorDappCustomSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/CustomSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializationInput.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedGenericArrayType.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedType.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumEvolutionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EnumSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Envelope.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/FingerPrinter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/MapSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/ObjectSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/Schema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationHelper.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializationOutput.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SerializerFactory.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SingletonSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/SupportedTransforms.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformTypes.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/TransformsSchema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigDecimalSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BigIntegerSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/BitSetSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CertPathSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ClassSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ContractAttachmentSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/CurrencySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/DurationSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/EnumSetSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InputStreamSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/InstantSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/LocalTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/MonthDaySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OffsetTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/OpaqueBytesSubSequenceSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PeriodSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PrivateKeySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/PublicKeySerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/SimpleStringSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ThrowableSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CRLSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/X509CertificateSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearMonthSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/YearSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZoneIdSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/amqp/custom/ZonedDateTimeSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Exceptions.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/MetaCarpenter.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/Schema.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/carpenter/SchemaFields.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClassResolver.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/CordaClosureSerializer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/DefaultKryoCustomizer.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/Kryo.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/KryoSerializationScheme.kt
# serialization/src/main/kotlin/net/corda/serialization/internal/kryo/SerializeAsTokenSerializer.kt
# serialization/src/test/java/net/corda/serialization/internal/ForbiddenLambdaSerializationTests.java
# serialization/src/test/java/net/corda/serialization/internal/LambdaCheckpointSerializationTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/ErrorMessageTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaGenericsTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaPrivatePropertyTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerialiseEnumTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/JavaSerializationOutputTests.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/ListsSerializationJavaTest.java
# serialization/src/test/java/net/corda/serialization/internal/amqp/SetterConstructorTests.java
# serialization/src/test/kotlin/net/corda/serialization/internal/AttachmentsClassLoaderTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/ContractAttachmentSerializerTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/CordaClassResolverTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/ListsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/MapsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/PrivateKeySerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/SerializationTokenTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/SetsSerializationTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/CorDappSerializerTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeAndReturnEnvelopeTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeMapTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryOfEnumsTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentrySimpleTypesTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeNeedingCarpentryTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializeSimpleTypesTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/DeserializedParameterizedTypeTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolvabilityTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumEvolveTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EnumTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/ErrorMessagesTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolutionSerializerGetterTesting.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/EvolvabilityTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/FingerPrinterTesting.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/GenericsTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/OverridePKSerializerTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/PrivatePropertyTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializationPropertyOrdering.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/SerializeAndReturnSchemaTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/amqp/StaticInitialisationOfSerializedObjectTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterTestUtils.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/ClassCarpenterWhitelistTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/CompositeMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/EnumClassTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/InheritanceSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/MultiMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/carpenter/SingleMemberCompositeSchemaToClassCarpenterTests.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoStreamsTest.kt
# serialization/src/test/kotlin/net/corda/serialization/internal/kryo/KryoTests.kt
# settings.gradle
2018-05-21 10:31:57 +01:00
2907250468
Mark HA notary design as deprecated ( #3171 )
...
This design is superseded by the CFT notary design.
* Mark HA notary design as deprecated
* Remove outdated HA notary service design
2018-05-21 09:57:29 +01:00
93245ac07d
Set the confirmationWindowSize setting in the bridge Artemis link. To reduce spam logging and improve performance.
...
Fixup doc pictures to match CRL config change
2018-05-21 09:52:04 +01:00
a5a860c52e
First pass doc on the bridge.conf configuration file.
...
More doc work on bridge
Fixup docs with regard to HA changes discovered during testing
Link to bridge docs and add note about Zookeeper prerequisite.
Doc in progress
Add operating modes to overview doc
Change to BridgeInner from FloatInner
Add diagram to worked configuration section
Fix some typos and comments from PR reviews
Try to tidy up some of the wording.
Add new config properties and change to subsection headers for mode discussion
2018-05-17 08:52:49 +01:00
46eda8edd9
Merge commit '3f2e653f0' into mike-merge-413f476a3
2018-05-15 19:00:05 +02:00
62265088ba
Merge commit '7b26f4ecb' into mike-merge-413f476a3
2018-05-15 18:20:37 +02:00
6030c01b21
Merge commit 'c7bfc8f65' into mike-merge-413f476a3
2018-05-15 18:20:30 +02:00
e64adca122
Merge commit '3a80cdfb6' into mike-merge-413f476a3
2018-05-15 18:20:21 +02:00
9a7535085b
Merge commit 'b2c28cb52' into mike-merge-413f476a3
2018-05-15 18:20:11 +02:00
b3ba32f24c
Merge commit '9cf06dff1' into mike-merge-413f476a3
2018-05-15 18:19:59 +02:00
89abd8c8f8
Merge commit '7b6284c50' into mike-merge-413f476a3
2018-05-15 18:19:41 +02:00
12fa4741a6
Merge commit '8cac69d2522ae37b2bb976347b5aad853c04795a' into mike-merge-413f476a3
2018-05-15 18:09:16 +02:00
7b26f4ecb4
Docs: import notary service HA doc.
2018-05-15 16:59:35 +02:00
c7bfc8f655
Docs: import monitoring and management
2018-05-15 16:59:35 +02:00
3a80cdfb68
Docs: Import kafka notary design doc.
2018-05-15 16:59:35 +02:00
b2c28cb523
Docs: import hadr design doc.
2018-05-15 16:59:35 +02:00
9cf06dff10
Docs: add float design doc, as is.
2018-05-15 16:59:35 +02:00
7b6284c504
Docs: add design doc "failure detection and master election"
2018-05-15 16:59:35 +02:00
8cac69d252
Docs: re-organise the toctree a bit more and introduce a design section
...
It includes (for now) just the design template.
2018-05-15 16:59:35 +02:00
7da0bcd741
Docs: simplify design review process doc and link into toctree.
2018-05-15 16:59:35 +02:00
987875d600
Docs: improve the appearance of monitoring and management
2018-05-15 16:59:35 +02:00
9868a18361
Docs: improve appearance of the Kafka design doc.
2018-05-15 16:59:35 +02:00
f29bbb6b16
Docs: Docs: switch from ReCommonMark to m2r, as RCM is not really maintained and is buggy.
...
Tidy up presentation of HA design doc.
Misc markup fixes throughout, as revealed by m2r.
2018-05-15 16:59:35 +02:00
