1524 Commits

Author	SHA1	Message	Date
Andrius Dagys	5373c6364f	Design: HA Notary service (#368)	2018-04-18 14:44:23 +01:00
Anthony Keenan	5f0d157432	Merge pull request #750 from corda/anthony-os-merge-20180418 ... O/S Merge	2018-04-18 13:02:56 +01:00
Andrius Dagys	e09719fe67	Design: Kafka-based notary service (#700) ... * Design: high performance Kafka-based CFT notary service. * Add discussion why we don't consider RDBMSs for the committed state index. * Add discussion on how we could utilise Kafka partitioning.	2018-04-18 11:44:53 +01:00
Anthony Keenan	af77c5a287	Merge remote-tracking branch 'open/master' into anthony-os-merge-20180418 ... # Conflicts: # constants.properties # docs/source/changelog.rst	2018-04-18 11:24:22 +01:00
Anthony Keenan	7db48de2b8	CORDA-1344 Fix query paging in scheduled flow tests (#2970) ... * Fix paging tests, move out of scheduled flow tests and provide java example * Fix a few issues with docs	2018-04-18 11:10:21 +01:00
Shams Asari	60323cca15	CORDA-1312: Network bootstrapper copies any CorDapp jars into each nodes' cordapps dir (#2974)	2018-04-17 15:38:25 +01:00
josecoll	89aa2b57e5	Merged release notes, upgrade notes, and changelog from DP3 release branch to master. (#740)	2018-04-16 16:05:08 +01:00
Katelyn Baker	98b912e633	MERGE: OS Merge Fixes	2018-04-13 11:46:36 +01:00
Katelyn Baker	03478142ef	MERGE: OS Merge Fixes	2018-04-13 10:44:10 +01:00
Katelyn Baker	5bb9514582	Merge remote-tracking branch 'open/master' into kat-merge-180412	2018-04-12 20:34:28 +01:00
Shams Asari	02913b284e	CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. (#2954) ... Instead the current whitelist is read in from the existing network parameters file.	2018-04-12 17:03:06 +01:00
Shams Asari	45d6bca071	Merge branch 'master' into os-merge-f88542f	2018-04-12 15:14:28 +01:00
Shams Asari	a83f3f3abe	Removing explicit waits for the default notary in driver tests. ... This issue was fixed in https://github.com/corda/corda/pull/2947.	2018-04-12 15:13:01 +01:00
Kat Baker	03850dabc2	Review comments	2018-04-12 11:58:56 +01:00
Katelyn Baker	f19bcea82f	CORDA-1229 - Setter serialization fails with lists ... Looks like the super / sub type inference of setter param vs getter param is the wrong way around. Also, Setter Type should be the generic type, not just the type the property must be a supertype of the setter parameter the getter must be a supertype of the setter parameter	2018-04-12 11:17:26 +01:00
Tudor Malene	241f7738e4	ENT-1704 restructure db migration documentation (#636)	2018-04-11 16:48:25 +01:00
Shams Asari	9b58114146	Merge remote-tracking branch 'open/master' into os-merge-f88542f ... # Conflicts: # docs/source/changelog.rst # finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt # node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt # testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt	2018-04-11 15:40:25 +01:00
Katelyn Baker	91fd40c806	RELEASE: Merge V3.0 upgrade notes to master ... This should've been done at release... I clearly missed back-merging this file	2018-04-11 15:37:47 +01:00
Matthew Nesbit	8c1e9c069e	Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411 ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/main/resources/reference.conf # node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt	2018-04-11 14:00:36 +01:00
Katelyn Baker	760cc1ec48	RELEASE - merge v3.1 release notes / upgrade notes / changelog to master (#2937) ... * RELEASE - 3.1 upgrade and release notes * Update docs for change to vno * address vno change in release notes * Update release-notes.rst * make corda links * Review comments * Review comments * review comments * remove ref to reverted bugfix * Review comments	2018-04-11 13:57:29 +01:00
Chris Rankin	f6e79cdbea	Upgrade to H2 1.4.197. (#2918)	2018-04-11 13:38:06 +01:00
Jiachuan	54a6fd0e06	CORDA-1201 Remove duplicated doc section. (#2924)	2018-04-11 11:08:20 +01:00
Shams Asari	3fbfd0deeb	Merge remote-tracking branch 'open/master' into os-merge-2792716	2018-04-07 18:23:14 +01:00
Katarzyna Streich	2792716157	CORDA-1181: Add back information on initial registration (#2943)	2018-04-07 15:18:05 +01:00
Michal Kit	c4df6b0c85	Fixing CRR signing execution mode (#677) ... * Fixing CRR signing execution mode * Addressing review comments	2018-04-06 17:00:47 +01:00
Joel Dudley	480b48a050	Adds a table of contents. Readds Dockerform instructions.	2018-04-06 14:42:04 +01:00
Anthony Keenan	2999f0eba2	Merge branch 'ak' into anthony-os-merge-20180406 ... # Conflicts: # docs/source/api-persistence.rst	2018-04-06 11:01:34 +01:00
Anthony Keenan	ec09188559	[CORDA-1292] Add CordaService testing documentation and improve tests in irs-demo (#2929) ... * Add CordaService testing documentation and improve tests in irs-demo * Addressed review comments	2018-04-06 09:22:58 +01:00
Viktor Kolomeyko	375b4638ba	Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt # node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt	2018-04-05 13:12:13 +01:00
szymonsztuka	76c1b08b27	Merge remote-tracking branch 'remotes/open/master' attempt 2	2018-04-05 11:18:01 +01:00
Joel Dudley	e5b54a07c4	Adds a missing import.	2018-04-05 09:15:05 +01:00
szymonsztuka	ad5ceedbd9	Merge remote-tracking branch 'remotes/open/master' ... # Conflicts: # docs/source/changelog.rst	2018-04-04 18:01:35 +01:00
szymonsztuka	22391c21c5	Change log and upgrade notes for Shell changes in CORDA-792. (#2919)	2018-04-04 15:59:05 +01:00
Joel Dudley	6572939e6e	Link to X509Utils. Makes it clear they are only an example.	2018-04-04 15:45:49 +01:00
Shams Asari	6283462548	Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd ... # Conflicts: # node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt	2018-04-04 14:18:24 +01:00
Joel Dudley	7deb802547	Adds link from changelog to upgrade notes.	2018-04-03 18:03:07 +01:00
Michal Kit	6593560655	Adding revocation reasons to docs. (#670)	2018-04-03 16:59:40 +01:00
cburlinchon	09758774e2	ENT-1716 Documentation for hot cold ha dp3 review comments (#649)	2018-04-03 13:17:15 +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
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
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
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
ags	ed9a31522b	Merge remote-tracking branch 'open/master' into ags_2018-03-29	2018-03-29 09:22:10 +01:00
Andrzej Grzesik	91036abe18	Update corda-configuration-file.rst	2018-03-28 22:41:37 +01:00
szymonsztuka	c28a16cb41	Description id docs and change log.	2018-03-28 17:09:42 +01:00
ags	43ead64240	updating docs	2018-03-28 15:54:58 +01:00