ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-15 23:22:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,871 Commits 96 Branches 407 Tags
Commit Graph

1644 Commits

Author SHA1 Message Date
Thomas Schroeter
23a0a66128 Merge remote-tracking branch 'open-source/master' into thomas-merge-3d50e73271cb3bbd95822575349995c9771729dd 2018-05-16 15:30:46 +01:00
Mike Hearn
46eda8edd9 Merge commit '3f2e653f0' into mike-merge-413f476a3 2018-05-15 19:00:05 +02:00
Joel Dudley
0c38a63486
Update generating-a-node.rst 2018-05-15 17:37:09 +01:00
Joel Dudley
502088d798
Update generating-a-node.rst 2018-05-15 17:36:17 +01: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
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
Chris Rankin
fafd8406fd Merge commit 'd0d07287' into chrisr3-os-merge 2018-05-15 13:22:34 +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
Tudor Malene
759ed7c3d0
CORDA-1369 set co.paralleluniverse.fibers.verifyInstrumentation=true in devMode (#3137) 2018-05-14 17:26:08 +01:00
Tudor Malene
6e59a694c1
CORDA-1461 fix merge (#3139) 2018-05-14 16:39:44 +01:00
sollecitom
9a69a36904 Merge remote-tracking branch 'remotes/open/master' into merges/may-14-15-21 
# Conflicts:
#	.idea/compiler.xml
#	constants.properties
#	experimental/behave/src/main/kotlin/net/corda/behave/network/Network.kt
#	experimental/behave/src/main/kotlin/net/corda/behave/node/Distribution.kt
#	experimental/behave/src/test/kotlin/net/corda/behave/service/PostreSQLServiceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/bridging/AMQPBridgeManager.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/HibernateConfiguration.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/messaging/MessagingExecutor.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/AbstractPartyToX500NameAsStringConverter.kt
#	node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionMappingStorage.kt
#	node/src/main/kotlin/net/corda/node/utilities/AddOrRemove.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	samples/irs-demo/web/src/test/kotlin/net/corda/irs/web/IrsDemoWebApplicationTests.kt
#	samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/InternalTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt
#	webserver/src/integration-test/kotlin/net/corda/webserver/WebserverDriverTests.kt
 2018-05-14 15:56:43 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. (#3136) 2018-05-14 21:15:52 +07:00
kid101
e3bc7fa0af Update tut-two-party-flow.rst (#3133) 
Bug: https://github.com/corda/corda/issues/3120
Updated line 55: From: IOUContract.Commands.Create -> IOUContract.Create
 2018-05-14 12:09:53 +01:00
Viktor Kolomeyko
aff7d0bb09
ENT-1865: Guidelines for creating RPC clients compatible with Hot/Cold node deployment. (#826) 
* ENT-1865: Guidelines for creating RPC clients compatible with Hot/Cold node deployment.

* ENT-1865: Changes to documentation following review by @thschroeter

* ENT-1865: Changes to documentation following review by @mnesbit
 2018-05-14 10:51:04 +01:00
Mike Hearn
eea7ae3a67
Merge pull request #832 from corda/mike-merge-ea81548d6 
Merge to ea81548d6
 2018-05-11 21:44:59 +02:00
Tudor Malene
543491c7df
CORDA-1461 improve devMode (#3100) 
* CORDA-1461 improve devMode

* CORDA-1461 set devMode=true for driver

* CORDA-1461 fix tests and improve UI

* CORDA-1461 Address code review changes

* CORDA-1461 Missing developer emoji

* CORDA-1461 use latest cordform that sets devMode=true

* CORDA-1461 fix test and add driver overrides for notary

* CORDA-1461 fix tests, fix api-scanner version

* CORDA-1461 fix api

* CORDA-1461 formatting

* CORDA-1461 comment style
 2018-05-11 17:48:02 +01:00
Katarzyna Streich
509a52ad5e
CORDA-866: Implement removal of stale nodes from network (#774) 
* 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
 2018-05-11 17:11:56 +01:00
Mike Hearn
ce7ba2182b Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6 2018-05-11 16:41:39 +02:00
Michele Sollecito
bb62538d28
[CORDA-1394]: Node can fail to fully start when a port conflict occurs, without a useful error message (fix). (#3119) 
* [CORDA-1394]: Meaningful message if required port is already in use.

* [CORDA-1394]: Meaningful message if required port is already in use.
 2018-05-11 20:08:53 +07:00
Mike Hearn
54e1a7aa7e Docs: fix some broken markup that caused rendering errors and warnings. 2018-05-11 13:02:40 +02:00
Mike Hearn
e110d17bce Docs: upgrade Sphinx and Pygments. 
We get coloured output from make html now. That seems to be the main benefit of the upgrade.
 2018-05-11 13:02:40 +02:00
Mike Hearn
5e759f5025 Docs: remove things from ChangeLog that aren't of interest to end users. 2018-05-11 13:02:40 +02:00