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

11418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michele Sollecito
36d403dd7d
[CORDA-1262]: Added integration test for Cash Selection. (#2874) 2018-03-26 14:07:17 +01:00
Tudor Malene
7978910e0b
ENT-1633 increase node max heap size to 512m (#2851) 2018-03-26 13:41:37 +01:00
Michele Sollecito
5677179504
Fixed incorrect reference to column "issuer_key" in cash selection SQL for Postgres. (#2870) 2018-03-23 18:04:40 +00:00
Katarzyna Streich
a888d78b42
Fix serialization on network map startup (#598) 
Fix serialization on network-management startup

Minor documentation fixes
 2018-03-23 17:01:46 +00:00
szymonsztuka
a723472651
Fix notary column definition in Liquibase for Postgres (#596) 
Postgres doesn't support precision for INT/INTEGER and BIGINT.
 2018-03-23 15:10:19 +00:00
Michele Sollecito
9b213973dd
Merge pull request #603 from corda/merges/march-23-11-47 
Merges: March 23 11:47
 2018-03-23 15:01:46 +00:00
Michele Sollecito
c3e6364bfd
Fixed incorrect reference to column "issuer_key" in cash selection SQL for Oracle, Postgres and SQLServer. (#601) 2018-03-23 14:39:39 +00:00
sollecitom
0b692d7482 Refactored as per code review comments. 2018-03-23 13:27:28 +00:00
Michal Kit
101eee1ff5
Adding jira integration to CRL (#579) 
* Adding jira integration

* Addressing review comments

* Adding review comments

* Fixes after rebase
 2018-03-23 12:54:38 +00:00
sollecitom
4ce69e3ace Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
 2018-03-23 12:17:34 +00:00
sollecitom
ca3ecb97cb Merge remote-tracking branch 'remotes/open/master' into merges/march-23-11-47 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/NodeStartAndStopTest.kt
#	node/src/integration-test/kotlin/net/corda/node/NodeStatePersistenceTests.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt
 2018-03-23 12:17:00 +00:00
Michele Sollecito
975b81c2c4
[CORDA-1243]: Avoid drain-related deadlocks between 2 nodes. (#2866) 2018-03-23 11:45:19 +00:00
Michal Kit
c9caaf8be4
Adding sockets (#570) 
* Adding sockets

* Addressing review comments

* Adding review comments

* Addressing review comments
 2018-03-23 07:43:13 +00:00
Shams Asari
e26db5faa6
Merge pull request #597 from corda/os-merge-620ba1e 
O/S merge from 620ba1e
 2018-03-22 16:00:13 +00:00
Shams Asari
7f2a056c45 Merge cleanup 2018-03-22 14:21:04 +00:00
Shams Asari
83367d5474 Merge remote-tracking branch 'open/master' into os-merge-620ba1e 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
 2018-03-22 14:13:50 +00:00
Shams Asari
620ba1e8a2
Integration test for network parameter updates and improved logging (#2863) 2018-03-22 14:08:07 +00:00
renlulu
7ce8d7a878 SUBMISSION - Remove repeated code (#2864) 2018-03-22 13:45:02 +00:00
szymonsztuka
f433ec88fe
Add support for database integration tests to new tests created for ENT-1433 (#594) 2018-03-22 11:45:03 +00:00
Tudor Malene
72b97be42c
Merge pull request #587 from corda/feature/ENT-1637/migration-tool-changes 
ENT-1673 Update migration tool to use the drivers folder and created reusable "createDatasourceFromDriverJars" function
 2018-03-22 10:35:55 +00:00
Patrick Kuo
ff4bbaf63f ENT-1524 & ENT-1358: Cleaned up doorman db schema (#565) 
* Renamed tables and constraints to have name < 30 characters
* Using AttributeConverters were possible for custom types
* NodeInfoEntity has relationship to accepted NetworkParametersEntity, not the hash
* Improved logging in the node
 2018-03-22 06:39:02 +00:00
Andras Slemmer
34d5f72f51
Merge pull request #591 from corda/aslemmer-ENT-1647 
ENT-1647: Ack duplicate messages
 2018-03-21 18:45:09 +00:00
igor nitto
ca010f881d
Merge pull request #592 from corda/merges/march-21-16-24 
Merge from OS/master
 2018-03-21 18:00:55 +00:00
igor nitto
88d7f7f720 Fix 2018-03-21 16:35:34 +00:00
igor nitto
dc076f83ba Merge remote-tracking branch 'open/master' into merges/march-21-16-24 2018-03-21 16:30:31 +00:00