11412 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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