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

11343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ags
51567e944d
detect quotes in config keys 2018-03-28 15:23:12 +01:00
Shams Asari
768dd32417
ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. (#2890) 
Also, added check to node startup that --initial-registration cannot occur in devMode
 2018-03-28 15:18:50 +01:00
Katarzyna Streich
848c516422
ENT-1662: Print better message when no keystore (#634) 
Print better message when no keystore

ENT-1662
Clarify how to run the node in network-management README.
 2018-03-28 14:47:22 +01:00
Andrius Dagys
447b41d936 MySQL notary service: improve database failover and exception handling. 
Transactions are now retried if a communication failure occurs during execute() or commit().
Note that this may result in duplicate entries in the notary request log, and false state
commit conflicts (the notary client would still receive a successful response).
We need to tidy this up in the future.
 2018-03-28 14:46:27 +01:00
szymonsztuka
76cb58f66a
Add database integration tests setup for CashSelectionTest (CORDA-1262) (#631) 2018-03-28 14:29:17 +01:00
ags
e60b816b19
double quotes in reference conf confuse people 2018-03-28 14:28:55 +01:00
Katelyn Baker
1baa89e9cb
Merge pull request #630 from corda/kat-merge-28-03-18 
Kat merge 28/03/18
 2018-03-28 13:50:17 +01:00
szymonsztuka
7370e6272e
Add support for database integration tests for DrainingMode tests (#607) 2018-03-28 12:49:09 +01:00
cburlinchon
4558651b58
ENT-1716 Documentation for hot cold ha (#628) 2018-03-28 11:44:07 +01:00
sollecitom
b93f12d413 Finished porting change to make JPA entities non-final and serializable. 2018-03-28 10:58:41 +01:00
Tudor Malene
1c9ab33a10
Merge pull request #627 from corda/feature/ENT-1699/migration_tool_fallback_reference_conf 
ENT-1699 fallback to reference conf when there's no datasource settin…
 2018-03-28 09:59:27 +01:00
Katelyn Baker
bc3605e8da Merge remote-tracking branch 'open/master' into kat-merge-28-03-18 2018-03-28 09:47:49 +01:00
Katelyn Baker
6c9a39ae44
DOCS: Serialization roundtrip removes mutability explanation (#2888) 2018-03-28 09:40:21 +01:00
Michele Sollecito
36f02ff4b4 [CORDA-1267]: Making Corda's JPA classes non-final and Serializable. (#2882) 
* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.

* Making Corda's JPA classes non-final and Serializable.
 2018-03-28 08:40:28 +01:00
szymonsztuka
a86178c8a4
Merge pull request #624 from corda/merges/drainingmode-integration-tests-27-03-2018 2018-03-27 16:57:39 +01:00
Tudor Malene
a07160287c ENT-1699 fallback to reference conf when there's no datasource settings on the migration tool 2018-03-27 16:49:13 +01:00
Michal Kit
68cdd5e374
ENT-1683 Ensuring that the updateDeadline time is in the future (#609) 
* Ensuring that the updateDeadline time is in the future

* Addressing review comments
 2018-03-27 15:20:08 +01:00
szymonsztuka
94557c7b88 Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018 - fix compilation error 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
 2018-03-27 15:04:35 +01:00
szymonsztuka
097233478a Merge remote-tracking branch 'remotes/opensource/master' into merges/drainingmode-integration-tests-27-03-2018 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
 2018-03-27 14:11:36 +01:00
szymonsztuka
4269e4a02e
DrainingMode integration tests - explicit node names, changed column names of a test table. (#2879) 
Align DrainingMode integration tests (related to CORDA-1243) with Enterprise repo.
 2018-03-27 14:00:28 +01:00
Thomas Schroeter
3ce5dac90f
Add experimental kubernetes support (#617) 2018-03-27 13:45:44 +01:00
Thomas Schroeter
f6e14b8d4d
Distributed notary setup fixes (#606) 
* MySQL notary is clustered notary

* Fix registration tool app class

* Allow config file without parent

* Fix `MySQLNotaryServiceTest`
 2018-03-27 13:03:46 +01:00
Katelyn Baker
47e2f5e8c9
Merge pull request #622 from corda/kat-merge-27-03-18 
Kat merge 27-03-18
 2018-03-27 11:52:44 +01:00
Katelyn Baker
1f2d9454ee Merge remote-tracking branch 'open/master' into kat-merge-27-03-18 2018-03-27 10:22:42 +01:00
Katelyn Baker
e43b12c203
CORDA-1236 - Don't let Carpenter exceptions escape the serializer (#2852) 
* CORDA-1236 - Don't let Carpenter exceptions escape the serializer

* Review comments

* Merge branch 'kat/bug/master/nestedCArpenterException' of https://github.com/corda/corda into kat/bug/master/nestedCArpenterException
 2018-03-27 10:11:39 +01:00
Katelyn Baker
0f99efa768
CORDA-1213 - Explicitly disallow serialization of non static nested classes (#2824) 
* CORDA-1213 - Explicitly disallow serialization of non static nested classes

WIP

* Review comments
 2018-03-27 10:06:46 +01:00
Katelyn Baker
91cdcc6752
CORDA-1258 - Only register custom serializers once (#2862) 
* CORDA-1258 - Only register custom serializers once

* Review comments

* Fix test
 2018-03-26 19:09:03 +01:00
Shams Asari
76298fc34b
Update to ENT-1433: Network parameter update entities in the db are not deleted, but rather marked as CANCELLED or APPLIED. (#600) 
Also, the node info entity refers to the update entity, and not to the network parameters entity, which brings in a natural check that the parameters hash that the node is accepting is a planned update.
 2018-03-26 18:20:13 +01:00
Anthony Keenan
8183da3d5c
Merge pull request #615 from corda/anthony-os-merge-20180326-2 
Anthony os merge 20180326
 2018-03-26 17:44:22 +01:00
Anthony Keenan
23e4f4cb6f Fix merge conflicts 2018-03-26 15:52:00 +01:00
Anthony Keenan
7dbceaadcb Merge remote-tracking branch 'open/master' 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
 2018-03-26 15:46:26 +01:00
Tudor Malene
eb73a3b68e
Merge pull request #611 from corda/merge/tudor-26-03 
Merge OS
 2018-03-26 15:27:12 +01:00
Clinton
16c98800cb
ENT-1672: Fixed database configuration for description field of parameters_update to fix doorman crash (#604) 2018-03-26 15:15:08 +01:00
Anthony Keenan
329fa94a09
CORDA-1002 Add node scheduler persistence tests (#2860) 
* Add node scheduler persistence tests

* Kill the scheduler threads after node scheduler tests

* Address review comments
 2018-03-26 14:48:58 +01:00
bpaunescu
47c7be62c0
ENT-1670: update kdocs and unit test for better user experience (#2875) 
* ENT-1670: update kdocs and unit test for better user experience regarding
RPC connection loss

* RPCStabilityTests: move doOnError logic to onError handler
 2018-03-26 14:27:35 +01:00
Katelyn Baker
c3031b182b
ENT-1665 - Update fast-classpath-scanner version to 2.12.3 (was 2.0.21) (#2877) 
Problem manifests now that the classpath scanner is used by the
serialisation framework in factory initialization to locate pluggable
serializers. The actual thrown error is

    java.lang.RuntimeException: Unknown constant pool tag

Given this is a known issue and a fixed bug it makes sense to move the
version forward. Unfortunately at this time we cannot move beyond
2.12.3 as 2.12.4 and later versions (up to the latest 2.18.1) exhibit
some other error that needs investigating. Thus, move to the latest
version that is stable for our current set of use cases.

More information on the nature of the problem exhibited by moving beyond
2.12.3 can be found on the linked Jira (ENT-1665) as well as details on
reproducing the issue moving forward to 2.12.3 fixes.
 2018-03-26 14:24:43 +01:00
tudor.malene@gmail.com
a01c9b41e1 Merge remote-tracking branch 'open/master' into merge/tudor-26-03 
# Conflicts:
#	testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
 2018-03-26 14:07:28 +01:00