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

11979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tudor Malene
759ed7c3d0
CORDA-1369 set co.paralleluniverse.fibers.verifyInstrumentation=true in devMode (#3137) 2018-05-14 17:26:08 +01:00
sollecitom
dc1bf3ad34 Merge remote-tracking branch 'remotes/origin/tudor_merge_14_05_2018' into merges/may-14-15-21 
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
 2018-05-14 17:19:51 +01:00
Tudor Malene
a1616767b8 Fix merge 2018-05-14 17:17:48 +01:00
Chris Rankin
4f9bbc8820
ENT-1463: Isolate more non-deterministic code from AMQP serialisation. (#3138) 2018-05-14 16:50:43 +01:00
sollecitom
61245c9675 Fixed copy names in Driver. 2018-05-14 16:40:09 +01:00
Tudor Malene
6e59a694c1
CORDA-1461 fix merge (#3139) 2018-05-14 16:39:44 +01:00
sollecitom
abc630fca4 Merge remote-tracking branch 'remotes/origin/tudor_merge_14_05_2018' into merges/may-14-15-21 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
 2018-05-14 16:15:23 +01:00
sollecitom
a1b4c9c7f1 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 16:07:21 +01:00
Tudor Malene
ec20359518 Fix merge 2018-05-14 16:05:30 +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
Matthew Nesbit
4fa5c00be8
Merge pull request #836 from corda/mnesbit-change-bridge-mode-constant 
Change the FloatInner config property to BridgeInner to be more consistent
 2018-05-14 15:46:34 +01:00
josecoll
9d822cdbe8
CORDA-861 Pagination failure with aggregate groupBy query (#3135) 
* Pagination relies on a recursive call to count total results, this sub-query should NOT perform pagination checks.

* Fix using defaulted parameter.

* Make internal method private.
 2018-05-14 15:34:21 +01:00
Tudor Malene
95054f71d5 Fix merge 2018-05-14 15:23:27 +01:00
tudor.malene@gmail.com
9b42dd3a87 Merge branch 'tudor_os_merge' into tudor_merge_14_05_2018 
# Conflicts:
#	constants.properties
#	node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
 2018-05-14 15:20:14 +01:00
Michele Sollecito
d027b5b8f2
[CORDA-1472]: Crackdown on warnings. (#3136) 2018-05-14 21:15:52 +07:00
Matthew Nesbit
1d1d05086f Change the FloatInner config property to BridgeInner to be more consistent. 2018-05-14 14:30:32 +01:00
Matthew Nesbit
4e7bbbaf93
Merge pull request #831 from corda/mnesbit-fix-flaky-test 
Fix flaky integration test and Smoke Test
 2018-05-14 14:19:34 +01:00
kid101
5a92079011 Updated CONTRIBUTORS.md after resloving #3120 (#3134) 
Added name to Contributors list after fixing https://github.com/corda/corda/issues/3120
 2018-05-14 12:13:27 +01: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
Matthew Nesbit
ebe6d5060e Fix flaky integration test 
Reenable broken smokeTest so I can investigate

Testing testing

Testing testing

remove debug
 2018-05-14 11:40:25 +01:00
Matthew Nesbit
ae48e6e4fb Fix a Unit Test error that appears to be on ENT master now? (#835) 2018-05-14 17:38:59 +07:00
cburlinchon
65bae084da
ENT-1673 - Add command line arg to exclude jars from capsule on startup (#775) 2018-05-14 11:33:06 +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
Chris Rankin
e3062e7b9e
Merge pull request #834 from corda/chrisr3-os-merge 
Merge to a2de18b6
 2018-05-14 10:30:59 +01:00
Andras Slemmer
7076605371
Merge pull request #822 from corda/aslemmer-fix-shadowjar-task 
disable default jar task
 2018-05-14 09:48:08 +01:00
Matthew Nesbit
3c005789c0
ENT-1850: Improve reporting of connection problems (#3124) 
* Add nicer logging for SSL handshake problems

* Just in case let people see the horrid netty exception traces at trace level
 2018-05-14 09:14:09 +01:00
Chris Rankin
6077a04ec2 Fix node heartbeat test (NetworkMapTest). 2018-05-12 15:42:04 +01:00
Chris Rankin
b43a54326b Merge commit 'a2de18b63cf3d4b146872e1609bf112fc21ffbcd' into chrisr3-os-merge 2018-05-12 12:43:37 +01:00
Richard Gendal Brown
e47a84ab49
Merge pull request #3126 from corda/contributor-typos 
typos
 2018-05-11 22:36:32 +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