Commit Graph

11879 Commits

Author SHA1 Message Date
18393f27dd Test doorman with selected dbs only for now (SQL Server and Azure SQL) - for ENT-1447. (#833)
Test doorman with selected dbs (SQL Server and Azure SQL) only in integration test in database mode since not all databases are supported now.
2018-05-17 16:27:02 +01:00
6aa971332d Merge pull request #851 from corda/colljos-merge-160518
OS -> ENT merge
2018-05-17 13:17:01 +01:00
a797c693fb Sync api-current.txt file.
Add missing JvmStatic annotation.
2018-05-17 10:59:49 +01:00
d9a647bdf0 Merge pull request #820 from corda/mnesbit-bridge-docs
Initial very basic docs for the bridge
2018-05-17 10:39:33 +01:00
ac97bf4f31 Merge pull request #848 from corda/mnesbit-bridge-artemis-exponential-backoff
ENT-1597: Add exponential backoff to bridge Artemis reconnection
2018-05-17 10:01:14 +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
0b4e3ea5c7 Add exponential backoff to bridge Artemis reconnection 2018-05-17 08:17:09 +01:00
ca89854493 Merge pull request #849 from corda/mnesbit-bridge-configurable-zktopic
ENT-1597: Allow HA topic in zookeeper to be configurable and test it.
2018-05-17 08:13:08 +01:00
b998901da4 Align API signature with OS. 2018-05-16 18:21:10 +01:00
0cc1b5f4b9 Merge remote-tracking branch 'open/master' into colljos-merge-160518
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
2018-05-16 18:20:22 +01:00
27803cdc9e ENT-1887 Make sure open and enterprise API are identical (#3158)
* Sync public API's (and associated internal helpers) between Enterprise and OS.

* Add previous default constructor explicitly.

* Keep the API checker happy!

* Revert addition of ENT makeTestDataSourceProperties() function.
2018-05-16 18:01:53 +01:00
0318b73b85 Merge pull request #846 from corda/thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd
Thomas merge 3d50e73271
2018-05-16 16:46:42 +01:00
8e934df217 Fix db transaction check (#3164) 2018-05-16 15:55:51 +01:00
23a0a66128 Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd 2018-05-16 15:30:46 +01:00
3d50e73271 Add configuration notary.serviceLegalName for clustered notaries 2018-05-16 15:19:14 +01:00
7cb6ed74d1 Allow HA topic in zookeeper to be configurable and test it. 2018-05-16 14:45:50 +01:00
573210486d snapshot should be all uppercase (#3123) 2018-05-16 14:40:47 +01:00
65b782c206 ENT-933 Add spectator and participant profiles of rigorousMock (#3157) 2018-05-16 13:56:41 +01:00
87e955701c Merge pull request #3161 from corda/CORDA-1491/aslemmer-fix-ack-race
CORDA-1491: Use MessagingExecutor for deduplication ACK codepath
2018-05-16 13:20:25 +01:00
478558bd8a add more information to jira ticket (#812) 2018-05-16 13:14:04 +01:00
3392c15c0b CORDA-1491: Use MessagingExecutor for deduplication ACK codepath 2018-05-16 12:21:29 +01:00
b06738b371 CORDA-1093 Deleting node info from directory (#3115)
* CORDA-1093 Deleting node info from directory

Deleting NodeInfo from additional-node-infos directory should remove it from cache.
2018-05-16 11:45:59 +01:00
346c05a72f Merge pull request #844 from corda/git-merge-3f2e653f0
Merge to 3f2e653f0
2018-05-15 20:46:18 +02:00
46eda8edd9 Merge commit '3f2e653f0' into mike-merge-413f476a3 2018-05-15 19:00:05 +02:00
0c38a63486 Update generating-a-node.rst 2018-05-15 17:37:09 +01:00
502088d798 Update generating-a-node.rst 2018-05-15 17:36:17 +01: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
e87dd9258f Merge commit '3baf27bbc71a77d8f3190eaeff812f7ff522002c' into mike-merge-413f476a3 2018-05-15 18:09:56 +02:00
3f2e653f01 Update references to point to new repo and remove other redundant references. (#3151) 2018-05-15 17:09:50 +01:00
12fa4741a6 Merge commit '8cac69d2522ae37b2bb976347b5aad853c04795a' into mike-merge-413f476a3 2018-05-15 18:09:16 +02:00
b031e66ab9 CORDA-1238: Updated JacksonSupport to support SerializedBytes, CertPath, X509Certificate and the signature classes (#3145)
SerializedBytes are first converted to the object it represents before being serialised as a pojo.

These changes will be needed to support the the blob inspector when it will output to YAML/JSON.
2018-05-15 17:02:43 +01:00
d53d910693 ENT-1824 Mutual Exclusion sleep (#841)
* Another host is detected as leader, sleep till lease expires
2018-05-15 16:48:37 +01: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
3baf27bbc7 Docs: bring certificate hierarchy design doc across into the open repo. 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
3f44910a2b Docs: use toctree to link design decisions into site. Update float design doc to fit with docsite. 2018-05-15 16:59:35 +02:00