ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-18 10:05:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,772 Commits 99 Branches 407 Tags
Commit Graph

11772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
josecoll
10a0891ab8 Updated scenarios to include official release versions of OS and R3 Corda. 
Grouped duplicate scenarios using examples.
Added additional README.md with explanation of feature/scenario types.
Updated scripts to reflect new directory location.
 2018-04-25 14:13:22 +01:00
Joel Dudley
486441c383
Changes flow tests used in flow testing tutorial to use MockNetwork instead of InternalMockNetwork. 2018-04-25 13:53:22 +01:00
Andras Slemmer
88c12791a8
Merge pull request #2999 from corda/CORDA-1368/aslemmer-transaction-wait-dbcommit 
CORDA-1368: Add flow-id to MDC, small fix in DBTransactionStorage
 2018-04-25 13:02:10 +01:00
Joel Dudley
8ce05e0ae3
Updates diagram to correctly show chain-walking process. 2018-04-25 12:54:57 +01:00
Anthony Keenan
f5483d1deb
ENT-1577 - Remove exposure of internal classes via test api (#516) 
* Remove exposures of internal classes via testing api

* Remove deleted api from api-current

* Fix merge conflict

* Remove internal usage from api-current.txt
 2018-04-25 11:59:20 +01:00
Andras Slemmer
29dbe6ab53 Add flow-id to MDC 2018-04-25 10:36:50 +01:00
Andras Slemmer
f1da044c86 Remove double wrap 2018-04-25 10:36:40 +01:00
Mike Hearn
8883803111
Merge pull request #548 from corda/MarkOldfield-patch-1 
Added design checklist
 2018-04-25 11:31:55 +02:00
Mike Hearn
3e27a85fe1 Minor: mention that h2port is only useful for developer mode in enterprise 2018-04-25 10:49:23 +02:00
Mike Hearn
f99d16eebb Merge remote-tracking branch 'open/master' into mike-merge-4cfb1606da 2018-04-25 10:43:23 +02:00
Mike Hearn
4cfb1606da
Minor: document the h2port option (#2988) 2018-04-25 10:38:59 +02:00
Chris Rankin
3fb3371d52
Upgrade DemoBench to TornadoFX 1.7.15 (for Kotlin 1.2). (#2998) 2018-04-24 19:50:43 +01:00
Chris Rankin
ff41f7f1ba
Merge pull request #771 from corda/chrisr3-os-merge 
Merge from OS
 2018-04-24 19:22:23 +01:00
josecoll
685897a7d2 Incorporating PR review feedback. 2018-04-24 19:14:14 +01:00
Konstantinos Chalkias
03fb9d4be2
CORDA-1354 Check for jars in nested folders (to add in classpath) (#2981) 
+ edge cases (logging if we don't have permission to jar folders)
 2018-04-24 18:43:07 +01:00
Chris Rankin
e135cf062c Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge 2018-04-24 18:09:41 +01:00
Tommy Lillehagen
25bee1903a
ENT-1263 - Use MRENCLAVE instead of enclave ID in create_thread (#487) 
* ENT-1263 - Use MRENCLAVE instead of enclave_id for create_thread

* ENT-1263 - Dedup dependencies in JAR

* ENT-1263 - Ensure C++ 11 is used for enclave inspection tool

* ENT-1263 - Throw exception if enclave ID mapping does not exist
 2018-04-24 17:11:33 +01:00
Andras Slemmer
e3c792c93d
Merge pull request #768 from corda/aslemmer-merge-10c559a3f3dc1cc8055e3204cd289468fbf3e644 
CORDA-1334: Merge up to 10c559a3f3dc1cc8055e3204cd289468fbf3e644
 2018-04-24 16:29:45 +01:00
Chris Rankin
5f70b6e049
Upgrade to corda-gradle-plugins 4.0.14 (#2996) 2018-04-24 15:50:38 +01:00
Chris Rankin
0f4bb8a87c
Upgrade to Kotlin 1.2 API. (#770) 2018-04-24 14:18:11 +01:00
Chris Rankin
8e507d0b88
CORDA-1263: Replace deprecated kotlin-stdlib-jre8 with kotlin-stdlib-jdk8. (#2992) 2018-04-24 14:03:41 +01:00
Andras Slemmer
f7e068b842 Merge commit '10c559a3f3dc1cc8055e3204cd289468fbf3e644' into aslemmer-merge-10c559a3f3dc1cc8055e3204cd289468fbf3e644 2018-04-24 11:19:01 +01:00
Andras Slemmer
67f5bcc38e Merge commit '640e5c60886b23068162205db82b1ae5c7c7eec8' into aslemmer-merge-640e5c60886b23068162205db82b1ae5c7c7eec8 2018-04-24 11:01:21 +01:00
Shams Asari
65525d74e7
CORDA-1325: Bootstrapper unable to whitelist two versions of the same contract simultaneously (#2980) 
Also added unit tests
 2018-04-24 10:51:24 +01:00
Andras Slemmer
10c559a3f3
Merge pull request #2991 from corda/aslemmer-cherry-7759fdbb71ea9b2021afd8af0ac05447c5305b3a 
cherry-pick 7759fdbb71ea9b2021afd8af0ac05447c5305b3a
 2018-04-24 10:33:22 +01:00
Matthew Nesbit
bb4dab7451
Merge pull request #765 from corda/mnesbit-round-robin-bridge-artemis 
Add Artemis round-robin support to the bridge
 2018-04-24 10:13:14 +01:00
Chris Burlinchon
b0d2a258c0 cherry-pick 7759fdbb71ea9b2021afd8af0ac05447c5305b3a 2018-04-24 09:36:57 +01:00
bpaunescu
c4ceca3787
Merge pull request #2989 from corda/ENT-1775-PR759 
ENT-1775: reworked client to handle failover in HA mode instead of Artemis
 2018-04-23 17:15:00 +01:00
Shams Asari
fc3dde9f66
Merge pull request #767 from corda/os-merge-d3446e2 
O/S merge from d3446e2
 2018-04-23 17:10:32 +01:00
Rick Parker
51df3872b2
ENT-1791 Stop performance tests returning whole transactions (#752) 2018-04-23 16:55:55 +01:00
Andras Slemmer
640e5c6088
Merge pull request #2964 from corda/CORDA-1334/aslemmer-enterprise-smm-port 
CORDA-1334: port enterprise statemachine
 2018-04-23 16:42:10 +01:00
Matthew Nesbit
6d270685aa Add Artemis round-robin support for node hot-cold in-process Artemis modes. 2018-04-23 16:14:10 +01:00
Shams Asari
8689d022ca Merge fixes 2018-04-23 15:52:37 +01:00
Shams Asari
5f781193b6 Merge remote-tracking branch 'open/master' into os-merge-d3446e2 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt
#	node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt
#	testing/smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeProcess.kt
#	tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt
 2018-04-23 15:50:24 +01:00
Viktor Kolomeyko
f64226364b
Merge pull request #766 from corda/feature/vkolomeyko/corda-os-merge 
OS->Ent merge
 2018-04-23 15:45:30 +01:00
Andras Slemmer
6bf34ed5c7 Fix bugs 2018-04-23 15:36:16 +01:00
Andras Slemmer
5b4fd6fe64 Address comments 2018-04-23 15:36:16 +01:00
Rick Parker
57caf9af28 Cherry pick 34f871936315097fd54c440912c51ce62b4f922a 2018-04-23 15:36:16 +01:00
Andras Slemmer
19dad6da96 Add back deprecated functions 2018-04-23 15:36:16 +01:00
Andras Slemmer
ce5fb66260 StateMachine rewrite 2018-04-23 15:36:16 +01:00
Shams Asari
d3446e213c
Introduced a few more extension methods to Path, which are clearer than the static methods in Files. (#2985) 
Also migrated code away from the old File API.
 2018-04-23 14:31:49 +01:00
Viktor Kolomeyko
071be31916 Resolve merge conflicts 2018-04-23 14:27:32 +01:00
Viktor Kolomeyko
f1fd1cefd8 Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/corda-os-merge 2018-04-23 14:19:51 +01:00
Viktor Kolomeyko
3aaa176dd4
CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning (#2977) 
* CORDA-1355: Introduce a dedicated property which controls what is going to be in scope for classpath scanning

* CORDA-1355: Update change log

* CORDA-1355: Minor change to improve readability.

* CORDA-1355: Custom serializers documentation update to mention new system property.
 2018-04-23 13:55:40 +01:00
josecoll
5ae35b70dc
Merge pull request #764 from corda/colljos-merge-230418 
OS -> ENT merge
 2018-04-23 13:26:15 +01:00
josecoll
15c015e0d6 Merge branch 'master' into colljos-merge-230418 2018-04-23 12:12:16 +01:00
josecoll
4c3d223d5a CTS QA Scenarios 2018-04-23 11:53:11 +01:00
bpaunescu
e51878417b Address PR comments 2018-04-23 11:20:08 +01:00
Viktor Kolomeyko
bf4d8ba08c
CORDA-1335: Scan attachment Jar only to speed-up the process. (#2982) 
* CORDA-1335: Scan attachment Jar only to speed-up the process.

* CORDA-1335: Explicitly mention other types of contracts to scan.

* CORDA-1335: Refactor to eliminate listing different subclasses of Contract in two separate places.
 2018-04-23 09:17:43 +01:00
bpaunescu
be083d6763 Added helper method for creating tcp transports from a list of host:port 2018-04-22 15:04:19 +01:00