Mike Hearn
346c05a72f
Merge pull request #844 from corda/git-merge-3f2e653f0
...
Merge to 3f2e653f0
2018-05-15 20:46:18 +02:00
Mike Hearn
46eda8edd9
Merge commit '3f2e653f0' into mike-merge-413f476a3
2018-05-15 19:00:05 +02:00
Mike Hearn
62265088ba
Merge commit '7b26f4ecb' into mike-merge-413f476a3
2018-05-15 18:20:37 +02:00
Mike Hearn
6030c01b21
Merge commit 'c7bfc8f65' into mike-merge-413f476a3
2018-05-15 18:20:30 +02:00
Mike Hearn
e64adca122
Merge commit '3a80cdfb6' into mike-merge-413f476a3
2018-05-15 18:20:21 +02:00
Mike Hearn
9a7535085b
Merge commit 'b2c28cb52' into mike-merge-413f476a3
2018-05-15 18:20:11 +02:00
Mike Hearn
b3ba32f24c
Merge commit '9cf06dff1' into mike-merge-413f476a3
2018-05-15 18:19:59 +02:00
Mike Hearn
89abd8c8f8
Merge commit '7b6284c50' into mike-merge-413f476a3
2018-05-15 18:19:41 +02:00
Mike Hearn
e87dd9258f
Merge commit '3baf27bbc71a77d8f3190eaeff812f7ff522002c' into mike-merge-413f476a3
2018-05-15 18:09:56 +02:00
josecoll
3f2e653f01
Update references to point to new repo and remove other redundant references. ( #3151 )
2018-05-15 17:09:50 +01:00
Mike Hearn
12fa4741a6
Merge commit '8cac69d2522ae37b2bb976347b5aad853c04795a' into mike-merge-413f476a3
2018-05-15 18:09:16 +02:00
Shams Asari
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
cburlinchon
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
Mike Hearn
7b26f4ecb4
Docs: import notary service HA doc.
2018-05-15 16:59:35 +02:00
Mike Hearn
c7bfc8f655
Docs: import monitoring and management
2018-05-15 16:59:35 +02:00
Mike Hearn
3a80cdfb68
Docs: Import kafka notary design doc.
2018-05-15 16:59:35 +02:00
Mike Hearn
b2c28cb523
Docs: import hadr design doc.
2018-05-15 16:59:35 +02:00
Mike Hearn
9cf06dff10
Docs: add float design doc, as is.
2018-05-15 16:59:35 +02:00
Mike Hearn
7b6284c504
Docs: add design doc "failure detection and master election"
2018-05-15 16:59:35 +02:00
Mike Hearn
3baf27bbc7
Docs: bring certificate hierarchy design doc across into the open repo.
2018-05-15 16:59:35 +02:00
Mike Hearn
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
Mike Hearn
7da0bcd741
Docs: simplify design review process doc and link into toctree.
2018-05-15 16:59:35 +02:00
Mike Hearn
987875d600
Docs: improve the appearance of monitoring and management
2018-05-15 16:59:35 +02:00
Mike Hearn
9868a18361
Docs: improve appearance of the Kafka design doc.
2018-05-15 16:59:35 +02:00
Mike Hearn
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
Mike Hearn
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
Mike Hearn
1895872307
Docs: improve rendering of "failure detection and master election"
2018-05-15 16:59:35 +02:00
Mike Hearn
534863fb7c
Minor: rename directory for cert hierarchies doc to remove JIRA ref.
2018-05-15 16:59:35 +02:00
Mike Hearn
0dd0657194
Docs: add support for Markdown to Sphinx
2018-05-15 16:59:35 +02:00
Mike Hearn
75b621bdce
Docs: improve appearance of notary service HA doc.
2018-05-15 16:59:35 +02:00
Mike Hearn
6ff91cadca
Docs: add a note to the top of the cert hierarchies design doc.
...
Enable AutoStructify in ReCommonMark to allow rst/md to be mixed.
2018-05-15 16:59:35 +02:00
Mike Hearn
2c16de8ec4
Docs: reorganise the left hand table of contents.
...
It now has an app dev section, an operations section, and a "participate" section.
2018-05-15 16:59:35 +02:00
Mike Hearn
da01312ab6
Docs: adjust the certificate hierarchy design doc to render better in sphinx.
2018-05-15 16:59:35 +02:00
Katelyn Baker
361569901a
Merge pull request #824 from corda/kat/doorman-playing
...
ENT-1872 - Better cmdline failure msgs for Doorman
2018-05-15 15:57:45 +01:00
Andras Slemmer
32aa1bf9d2
Merge pull request #2978 from corda/CORDA-1352/aslemmer-os-killflow
...
CORDA-1352: Add killFlow
2018-05-15 15:49:27 +01:00
Chris Rankin
a961b06668
Merge pull request #842 from corda/chrisr3-os-merge
...
Merge from OS
2018-05-15 15:26:56 +01:00
Chris Rankin
ade576625e
Remove unwanted transitive dependencies of Kryo from the Bridge.
2018-05-15 14:15:49 +01:00
Chris Rankin
6438374d61
Add missing (C) header.
2018-05-15 13:30:02 +01:00
Tudor Malene
26c6ba6118
CORDA-1461 Fix smoke tests ( #3150 )
2018-05-15 13:25:28 +01:00
Chris Rankin
fafd8406fd
Merge commit 'd0d07287' into chrisr3-os-merge
2018-05-15 13:22:34 +01:00
Chris Rankin
d0d07287e7
Remove duplicate Netty classes from Node. ( #3142 )
...
* Remove duplicate Netty classes from Node.
* Force all Netty modules to our given version.
2018-05-15 12:35:00 +01:00
Katarzyna Streich
24fa695ca0
CORDA-866: Implement removal of stale nodes from network - backport ( #3128 )
...
* CORDA-866: Implement removal of stale nodes from network
Backported
* Implement removal of stale nodes from network
Add eventHorizon to NetworkParameters structure. Add republishing of
node info on 1 day intervals - it is treated by network map as heartbeat from node indicating if it's alive or not. Add removal of old node infos on network map signing.
* Add copy method to NetworkParameters data class
Add JvmOverloads annotation to the constructor, because it's data class
exposed in API
* Fix test
2018-05-15 12:10:04 +01:00
Chris Rankin
84d94d44ad
ENT-1463: Hide more AMQP ConcurrentHashMaps behind interfaces. ( #3147 )
2018-05-15 12:03:33 +01:00
Joel Dudley
323e809f8c
Update CONTRIBUTORS.md
2018-05-15 11:23:15 +01:00
Michele Sollecito
454899bc77
Merge pull request #840 from corda/merges/may-14-15-21
...
Merges May 14 15:21
2018-05-15 15:54:47 +07:00
sollecitom
5776e7788e
Merge branch 'master' into merges/may-14-15-21
2018-05-15 09:54:03 +01:00
Tudor Malene
274dead627
Merge pull request #839 from corda/tudor_merge_14_05_2018
...
Tudor merge 14 05 2018
2018-05-15 09:52:39 +01:00
Joel Dudley
dce0956f37
Update FlowLogic.kt ( #3144 )
2018-05-15 09:40:50 +01:00
renlulu
b2e9a427a8
Extracted a tool class to reduce duplicated logic between InMemoryIdentityService and PersistentIdentityService ( #3141 )
2018-05-14 18:00:07 +01:00
Joel Dudley
e1dc57ba9d
Update CONTRIBUTORS.md
2018-05-14 17:40:52 +01:00
