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
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
7978910e0b
ENT-1633 increase node max heap size to 512m ( #2851 )
2018-03-26 13:41:37 +01:00
dc076f83ba
Merge remote-tracking branch 'open/master' into merges/march-21-16-24
2018-03-21 16:30:31 +00:00
4d15e17027
Documents TestIdentity in the testing API docs.
2018-03-21 15:39:16 +00:00
9b981c2755
Corrects bootstrapper JAR name.
2018-03-21 15:35:55 +00:00
79c7fd7c82
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
added missing changelog line
2018-03-20 17:13:30 +00:00
aaa9e8c83f
Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18
...
# Conflicts:
# docs/source/changelog.rst
2018-03-20 16:54:56 +00:00
144632818c
Adding the X509CRL custom serializer. ( #2844 )
...
CORDA-1233
* Adding the X509CRL custom serializer.
* Addressing review comments
2018-03-20 15:42:25 +00:00
182294913a
CORDA-2615: Added description for configFile option in deployNodes Cordform Gradle task. ( #2825 )
2018-03-20 12:53:41 +00:00
cd038ea107
Fixed docsite on incorrect node config filename required for bootstrapping a local network. ( #2848 )
2018-03-20 11:42:48 +00:00
a80be413e0
Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1
2018-03-20 10:20:17 +00:00
5a05704d7a
Expands shell limitations section.
2018-03-20 08:14:33 +00:00
8a561cddbf
Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41
...
# Conflicts:
# client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
# node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
# node/src/main/java/CordaCaplet.java
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-03-19 15:17:49 +00:00
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell ( #2831 )
2018-03-19 14:20:10 +00:00
c4dc8accde
Merge remote-tracking branch 'remotes/opensource/master' into merges/1
2018-03-16 17:52:01 +00:00
5b7f06a39d
Direct bootstrapper link instead of manual build.
2018-03-16 16:07:39 +00:00
d60e0098f2
Removes the glossary and FAQ. Points people to StackOverflow for troubleshooting.
2018-03-16 13:41:38 +00:00
06ec20379c
Clarifies that shell doesn't require RPC permissions.
2018-03-16 11:37:23 +00:00
3c38cb9b2a
Merge remote-tracking branch 'open/master' into ags_2018-03-16
2018-03-16 09:58:52 +00:00
22008327cd
Clarifies that blocking calls should take a timeout
2018-03-15 17:10:39 +00:00
0d1e9694ae
Merge remote-tracking branch 'open/master' into andrius-merge-1503
2018-03-15 15:07:55 +00:00
f67c6874f4
Merge pull request #560 from corda/corda/tudor-os-merge
...
Corda/tudor os merge
2018-03-15 14:21:41 +00:00
52a4252ac5
[ENT-1567] Document hot-cold deployment
2018-03-15 10:35:12 +00:00
81932b4e88
Merge branch 'open_master' into corda/tudor-os-merge
...
# Conflicts:
# settings.gradle
# verifier/build.gradle
# verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
# verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
# verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
2018-03-15 10:21:35 +00:00
15e4449b38
Adding BigInteger serialization support ( #2804 )
...
* Adding BigInteger serialization support
* Addressing review comments
2018-03-15 10:11:01 +00:00
88c5ab8870
Feature/corda 1219/remove out of process verifier ( #2820 )
2018-03-15 09:57:59 +00:00
0a0c8538c4
Merge from Corda/OS
2018-03-14 17:24:47 +00:00
0b12c5f602
Merge remote-tracking branch 'open/master' into bogdan-merge-14
2018-03-14 15:01:27 +00:00
a7d0b124d2
Set up instructions no longer rely on Java installer in Mac (defaults to JDK 9).
2018-03-14 13:38:21 +00:00
dc250bc701
Minor clarification of network map docs.
2018-03-14 11:45:26 +00:00
df536cee86
CORDA-966 - RELEASE - Merge release notes from release branch to master ( #2775 )
2018-03-14 10:05:38 +00:00
34800ab527
Split up the parsing of the command line arguments from the parsing of the config files. ( #547 )
...
Also, the "config-file" command line argument for the doorman jar is required - it no longer defaults to network-management.conf
2018-03-14 07:01:53 +00:00
f31afd1520
Merge remote-tracking branch 'remotes/open/master' into merges/march-13-14-55
...
# Conflicts:
# build.gradle
# docs/source/_static/versions
# docs/source/running-a-node.rst
2018-03-13 15:02:58 +00:00
98f554c08d
Fix database doc - SQL Server / Azure and PostgreSQL ( #539 )
...
Fixed wrong configuration example for SQL Server / Azure, fixed duplicated and conflicting PostgreSQL instructions after merge from OS.
2018-03-13 11:31:25 +01:00
568f7d7c17
Documents limitations of calls to external resources in flows.
2018-03-13 09:34:00 +00:00
d591ed5907
Update key-concepts-transactions.rst.
2018-03-13 04:06:20 +09:00
