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
45d6bca071
Merge branch 'master' into os-merge-f88542f
2018-04-12 15:14:28 +01:00
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
03850dabc2
Review comments
2018-04-12 11:58:56 +01:00
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
241f7738e4
ENT-1704 restructure db migration documentation ( #636 )
2018-04-11 16:48:25 +01:00
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
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
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
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
f6e79cdbea
Upgrade to H2 1.4.197. ( #2918 )
2018-04-11 13:38:06 +01:00
54a6fd0e06
CORDA-1201 Remove duplicated doc section. ( #2924 )
2018-04-11 11:08:20 +01:00
3fbfd0deeb
Merge remote-tracking branch 'open/master' into os-merge-2792716
2018-04-07 18:23:14 +01:00
2792716157
CORDA-1181: Add back information on initial registration ( #2943 )
2018-04-07 15:18:05 +01:00
c4df6b0c85
Fixing CRR signing execution mode ( #677 )
...
* Fixing CRR signing execution mode
* Addressing review comments
2018-04-06 17:00:47 +01:00
480b48a050
Adds a table of contents. Readds Dockerform instructions.
2018-04-06 14:42:04 +01:00
2999f0eba2
Merge branch 'ak' into anthony-os-merge-20180406
...
# Conflicts:
# docs/source/api-persistence.rst
2018-04-06 11:01:34 +01:00
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
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
76c1b08b27
Merge remote-tracking branch 'remotes/open/master' attempt 2
2018-04-05 11:18:01 +01:00
e5b54a07c4
Adds a missing import.
2018-04-05 09:15:05 +01:00
ad5ceedbd9
Merge remote-tracking branch 'remotes/open/master'
...
# Conflicts:
# docs/source/changelog.rst
2018-04-04 18:01:35 +01:00
22391c21c5
Change log and upgrade notes for Shell changes in CORDA-792. ( #2919 )
2018-04-04 15:59:05 +01:00
6572939e6e
Link to X509Utils. Makes it clear they are only an example.
2018-04-04 15:45:49 +01:00
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
7deb802547
Adds link from changelog to upgrade notes.
2018-04-03 18:03:07 +01:00
6593560655
Adding revocation reasons to docs. ( #670 )
2018-04-03 16:59:40 +01:00
09758774e2
ENT-1716 Documentation for hot cold ha dp3 review comments ( #649 )
2018-04-03 13:17:15 +01:00
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
4106e9837d
Clearer caveat about using observable states.
2018-04-03 09:11:35 +01:00
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
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
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
bf5f812b68
Merge pull request #647 from corda/ags_2018-03-29
...
Merge of CORDA-1277
2018-03-29 11:01:12 +01:00
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
2e1f591e7f
Generate a PDF version of the docsite. Request from a user in Slack.
2018-03-29 10:48:58 +02:00
ed9a31522b
Merge remote-tracking branch 'open/master' into ags_2018-03-29
2018-03-29 09:22:10 +01:00
91036abe18
Update corda-configuration-file.rst
2018-03-28 22:41:37 +01:00
c28a16cb41
Description id docs and change log.
2018-03-28 17:09:42 +01:00
43ead64240
updating docs
2018-03-28 15:54:58 +01:00
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
4558651b58
ENT-1716 Documentation for hot cold ha ( #628 )
2018-03-28 11:44:07 +01:00
bc3605e8da
Merge remote-tracking branch 'open/master' into kat-merge-28-03-18
2018-03-28 09:47:49 +01:00
6c9a39ae44
DOCS: Serialization roundtrip removes mutability explanation ( #2888 )
2018-03-28 09:40:21 +01:00
1f2d9454ee
Merge remote-tracking branch 'open/master' into kat-merge-27-03-18
2018-03-27 10:22:42 +01:00
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
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
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
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
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
