ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,380 Commits 91 Branches 405 Tags 354 MiB
23184b7495
Commit Graph

11380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rick Parker
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw (#675) 2018-04-04 15:49:00 +01:00
Michal Kit
6c2cfc3880
ENT-1732 Preventing non-notaries composite keys being submitted in node info (#676) 
* Preventing non-notaries composite keys being submitted in node info

* Addressing review comments
 2018-04-04 14:33:40 +01:00
Andras Slemmer
4334d38bf5
Merge pull request #672 from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04 
Merge OS up to 2f1b8ff23e
 2018-04-04 12:07:07 +01:00
Andrius Dagys
5909a49c30
ENT-1725: Introduce FlowAsyncOperation (#658) 
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.

* Move async execute to internal, add more tests.

* Add a 30s test timeout

* Update API doc
 2018-04-04 09:52:49 +01:00
Andras Slemmer
ff3d497d15
Merge pull request #447 from corda/aslemmer-more-flow-metrics 
Measure Action execution times, utilised flow threads
 2018-04-04 09:47:53 +01:00
Matthew Nesbit
91e556c793
Merge pull request #668 from corda/mnesbit-bridgeperf-env 
Add jmeter files required for testing bridge environment.
 2018-04-04 09:21:43 +01:00
Andras Slemmer
e9d2963912 Measure Action execution times, utilised flow threads 2018-04-03 18:54:48 +01:00
Andras Slemmer
fbafe36643 Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04 2018-04-03 17:10:33 +01:00
Matthew Nesbit
689aeac0e5 Add jmeter files required for testing bridge environment. 2018-04-03 17:08:35 +01:00
Michal Kit
6593560655
Adding revocation reasons to docs. (#670) 2018-04-03 16:59:40 +01:00
Chris Rankin
626ff5ec77
Merge pull request #669 from corda/chrisr3-merge-os 
ENT-1463: Instantiate all contract classes before verifying any of them.
 2018-04-03 16:34:48 +01:00
Michal Kit
2f1b8ff23e
Fixing SignedNodeInfoe security issue (#2908) 2018-04-03 15:49:06 +01:00
Katarzyna Streich
bba3721c86
ENT-1685: Add clarification of update process to README (#645) 
Add clarification of parameters update process to README
 2018-04-03 14:46:48 +01:00
Andras Slemmer
623eae7da1
Merge pull request #2907 from corda/aslemmer-CORDA-1295 
CORDA-1295: Clean up client->observable association on observable finish
 2018-04-03 14:20:05 +01:00
Matthew Nesbit
d0cec8cabb
Merge pull request #666 from corda/mnesbit-custom-bridge-ssl-config 
Fix the custom ssl configuration logic on the bridge
 2018-04-03 13:52:53 +01:00
Chris Rankin
5c32f34838 Merge commit 'cb670dcb6255aa07c2b06fe1e381d0c4d032634c' into chrisr3-merge-os 2018-04-03 13:21:01 +01:00
cburlinchon
09758774e2
ENT-1716 Documentation for hot cold ha dp3 review comments (#649) 2018-04-03 13:17:15 +01:00
Michele Sollecito
ae723a4adb
Merge pull request #665 from corda/merges/april-3-11-10 
Merges: April 3 11:10
 2018-04-03 12:35:44 +01:00
Chris Rankin
cb670dcb62
ENT-1463: Instantiate all contract classes before verifying any of them. (#2906) 2018-04-03 12:14:53 +01:00
Andras Slemmer
ef723b1b68 CORDA-1295: Use ConcurrentHashMap instead of synchronised multimap 2018-04-03 12:06:59 +01:00
Matthew Nesbit
e79989cc8f Fixup support for customized certificate configuration 
Fix typo
 2018-04-03 11:56:10 +01:00
Andras Slemmer
6d5e08b44e CORDA-1295: Clean up client->observable association on observable finish 2018-04-03 11:43:17 +01:00
sollecitom
454984f089 Merge remote-tracking branch 'remotes/open/master' into merges/april-3-11-10 
# Conflicts:
#	build.gradle
 2018-04-03 11:11:06 +01:00
Michele Sollecito
abcdfeedf4
[CORDA-1294]: Publish corda-shell module. (#2905) 2018-04-03 10:21:42 +01:00
Chris Rankin
87836361ea
Merge pull request #2903 from corda/chrisr3-verify-contract 
ENT-1463: Instantiate the contract class as part of contract verification.
 2018-04-03 10:16:16 +01:00
Joel Dudley
4106e9837d
Clearer caveat about using observable states. 2018-04-03 09:11:35 +01:00
Michal Kit
625d0447aa
ENT-992: Introducing the CRR submission tool (#633) 
* Introducing the CRR submission tool

* Addressing review comments

* Addressing review comments - round 2 - Redesign of the tool.

* Fixing messages
 2018-04-03 08:33:22 +01:00
Chris Rankin
b9b4415d10 ENT-1463: Instantiate the contract class as part of contract verification. (#660) 
* Instantiating the contract class should be part of contract verification. We should not instantiate it while building LedgerTransaction.
* Also catch any exceptions from instantiating the contract.
 2018-03-31 14:53:12 +01:00
Chris Rankin
9c07e67100
ENT-1463: Instantiate the contract class as part of contract verification. (#660) 
* Instantiating the contract class should be part of contract verification. We should not instantiate it while building LedgerTransaction.
* Also catch any exceptions from instantiating the contract.
 2018-03-31 14:52:08 +01:00
Chris Rankin
10e97f4919
Remove logback SLF4J backend from node tests. (#659) 
* Remove logback SLF4J backend from node tests.
* Use netty_version build variable.
 2018-03-30 23:52:53 +01:00
Michele Sollecito
fcf6ab65bd
Merge pull request #654 from corda/merges/march-29-13-11 2018-03-29 15:35:05 +01:00
Michal Kit
296e74aca7
Adding the @Produces annotation for the GET endpoints in the Network Map service (#652) 2018-03-29 15:09:39 +01:00
sollecitom
558f5cddce Porting change to make JPA entities non-final and serializable. 2018-03-29 13:17:22 +01:00
sollecitom
89ecfb96c5 Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11 2018-03-29 13:12:00 +01:00
Michele Sollecito
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. (#2892) 2018-03-29 13:01:41 +01:00
renlulu
196a24f030 Optimize imports (#2872) 2018-03-29 11:25:56 +01:00
szymonsztuka
bf5f812b68
Merge pull request #647 from corda/ags_2018-03-29 
Merge of CORDA-1277
 2018-03-29 11:01:12 +01:00
Michal Kit
109af246e6
ENT-992: Adding docs for the CRL/CRR (#608) 
* Adding docs for the CRL/CRR

* Addressing review comments

* Addressing review comments - round 2
 2018-03-29 10:48:28 +01:00
Mike Hearn
2e1f591e7f Generate a PDF version of the docsite. Request from a user in Slack. 2018-03-29 10:48:58 +02:00
Mike Hearn
eb52c8be35
Improve the upgrade-test-packages.sh script to work on macOS. Fixes an issue found by tom on pubslack. (#2894) 2018-03-29 10:47:48 +02:00
ags
ed9a31522b
Merge remote-tracking branch 'open/master' into ags_2018-03-29 2018-03-29 09:22:10 +01:00
Andrzej Grzesik
2863f8403b
CORDA-1277 Remove double quotes from keys in reference.conf 
CORDA-1277 Remove double quotes from keys in reference.conf
 2018-03-29 09:15:30 +01:00
Andrzej Grzesik
91036abe18
Update corda-configuration-file.rst 2018-03-28 22:41:37 +01:00
Shams Asari
d5d17c7b1b
Merge pull request #643 from corda/os-merge-d2b7f8b 
O/S merge from commit d2b7f8b
 2018-03-28 21:22:21 +01:00
igor nitto
d1f6f0a5bc
Fix SQL statement used by CashSelection on SQL Server (#641) 2018-03-28 18:13:29 +01:00
szymonsztuka
c28a16cb41 Description id docs and change log. 2018-03-28 17:09:42 +01:00
Shams Asari
71baccf167 Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b 2018-03-28 17:06:15 +01:00
Katarzyna Streich
d2b7f8b91f
ENT-1686: Improve error message on parameters mismatch (#2891) 
Improve error message on parameters mismatch
 2018-03-28 16:48:56 +01:00
ags
43ead64240
updating docs 2018-03-28 15:54:58 +01:00
Katarzyna Streich
2e4b223bd8
ENT-1668: Don't crash on node startup when network map is not available (#2887) 
Fix ENT-1668

Don't crash on node startup when network map is not available
 2018-03-28 15:42:39 +01:00