Ben Abineri
908a614888
Merge pull request #483 from corda/merges/february-23-15-30
...
Merges/february 23 15 30
2018-02-26 09:33:16 +00:00
sollecitom
d7b7dc4925
Merge branch 'master' into merges/february-23-15-30
2018-02-26 09:30:43 +00:00
Michele Sollecito
7828e658ac
Revert "Merges - 23rd February 2018 at 15:30 ( #479 )" ( #482 )
...
This reverts commit 2f60ff44a6
2018-02-26 09:28:56 +00:00
Joel Dudley
50ccb32700
Adds a 'provision the certificates' step to the Windows deployment instructions.
2018-02-26 09:21:27 +00:00
Maksymilian Pawlak
1bca591dd1
Disable unit test for experimental projects ( #2627 )
...
* Disable unit test for experimental projects
2018-02-23 20:48:39 +00:00
igor nitto
fd491d91ff
WebServer init failure on config produced by plugins >= 4.0.2 [CORDA-877] ( #2624 )
2018-02-23 18:29:49 +00:00
Michele Sollecito
2f60ff44a6
Merges - 23rd February 2018 at 15:30 ( #479 )
2018-02-23 17:53:15 +00:00
Thomas Schroeter
d3dcbfb6c3
Fix path of main class ( #478 )
2018-02-23 17:05:05 +00:00
sollecitom
11a484eb03
Fixed notary healthchecker cordformation.
2018-02-23 16:39:36 +00:00
sollecitom
e78e65bd01
refreshed api-current.txt
2018-02-23 16:19:13 +00:00
sollecitom
3d4e24a364
Patched doorman network parameters with empty list for now, and added a TODO.
2018-02-23 16:01:49 +00:00
sollecitom
d41b9a0299
merged OS into master
2018-02-23 15:47:07 +00:00
Michele Sollecito
191f412aba
Fixed flows draining mode after regression introduced by OS -> ENT merge ( #474 )
2018-02-23 15:19:37 +00:00
Michele Sollecito
5be0e4b39e
[CORDA-941]: Add NetworkParameters contract implementation whitelist. ( #2580 )
2018-02-23 14:29:02 +00:00
Shams Asari
977836f4eb
Enable tests which were ignored due to recent flakiness on TC and issue with maxTransactionSize which should now be resolved. ( #2621 )
2018-02-23 13:45:18 +00:00
Patrick Kuo
1552e992e7
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #2620 )
...
* ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role (#431 )
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
(cherry picked from commit 94f7392
2018-02-23 13:38:09 +00:00
Andras Slemmer
089916d350
Merge pull request #466 from corda/aslemmer-merge-19-Feb
...
Aslemmer merge 19 feb
2018-02-23 13:20:07 +00:00
Andrzej Cichocki
c8672d373f
CORDA-973 Compression support for serialization ( #2473 )
...
* Serialization magic is now 7 bytes
* Introduce encoding property and whitelist
2018-02-23 13:07:51 +00:00
Andras Slemmer
f5167e207f
Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb
2018-02-23 11:18:16 +00:00
Patrick Kuo
94f73920cc
ENT-1443 Add cert role to CSR and doorman issue cert according to the cert role ( #431 )
...
* Doorman and HSM create certificate base on requested cert role specified in the certificate signing request.
2018-02-23 10:57:59 +00:00
Shams Asari
2af0feee04
Various cleanup of the network map code ( #2604 )
2018-02-23 09:13:00 +00:00
Michele Sollecito
e91b74962b
[CORDA-1098]: Fixed Artemis filters for flows draining mode. ( #2613 )
2018-02-22 20:45:56 +00:00
Andras Slemmer
cf459dd823
Fix VerifierDriver
2018-02-22 17:16:43 +00:00
Andras Slemmer
dd8a709971
Ignore P2PFlowsDrainingModeTest
2018-02-22 15:32:47 +00:00
Andras Slemmer
67f9266b24
Merge pull request #2597 from corda/aslemmer-CORDA-1043
...
CORDA-1043
2018-02-22 14:56:20 +00:00
Joel Dudley
904f706e10
[CORDA-1035] Flow test API docs
2018-02-22 14:38:02 +00:00
Joel Dudley
c94b606cf0
Fixes a typo in the node deployment docs.
2018-02-22 14:15:25 +00:00
Andras Slemmer
33b24cb27e
Temporrary fix for transaction size check
2018-02-22 12:36:35 +00:00
Andras Slemmer
dbe02ced99
Fix up compiler.xml. I think
2018-02-22 10:45:00 +00:00
Andras Slemmer
1722ec5e69
Remove stringy check from test
2018-02-22 10:12:58 +00:00
Michele Sollecito
5db4882668
[CORDA-1089]: Ensure graceful error message is shown on node startup if RPC settings are invalid. ( #2595 )
2018-02-22 09:47:56 +00:00
igor nitto
731cb1b67e
Remove unused occurrences of 'exportJMXto' ( #2588 )
2018-02-21 19:05:55 +00:00
Andras Slemmer
6a2217ace6
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-21 18:10:37 +00:00
Andras Slemmer
51704cd7a4
Merge pull request #2591 from corda/aslemmer-fix-mocknetwork-networkparams
...
Pass network params to InternalMockNetwork
2018-02-21 18:00:02 +00:00
Andras Slemmer
31c278d460
Update API
2018-02-21 16:03:00 +00:00
Andras Slemmer
66cbe8c56d
CORDA-1043
2018-02-21 15:56:29 +00:00
Andras Slemmer
a3e2aff080
Fix tests
2018-02-21 15:14:00 +00:00
Mike Hearn
ffd726d592
Docs: discuss zone constraints, flow drains and more upgrade related topics ( #2585 )
...
Docs: discuss zone constraints, flow drains and more upgrade related topics.
2018-02-21 15:33:28 +01:00
Michele Sollecito
9ddd47ea39
[CORDA-1059]: Fix Driver hanging on duplicate node names. ( #2590 )
2018-02-21 11:28:51 +00:00
Andras Slemmer
1592c18770
Pass network params to InternalMockNetwork
2018-02-21 11:28:29 +00:00
Andras Slemmer
4e13523d64
Merge pull request #2583 from corda/aslemmer-remove-log-line
...
Remove spurious logline
2018-02-21 09:50:51 +00:00
Andras Slemmer
1027b0e49c
Fix HealthCheckFlow to work with distributed notaries
2018-02-20 18:00:59 +00:00
Mike Hearn
2cf2fdbc06
Address review comments
2018-02-20 18:45:38 +01:00
Mike Hearn
55a33acc32
Address review comments
2018-02-20 18:45:38 +01:00
Mike Hearn
7548c6c901
Docs: some work on the network map docs.
2018-02-20 18:45:38 +01:00
Andras Slemmer
68c2dd16d9
Remove spurious logline
2018-02-20 17:09:48 +00:00
Katelyn Baker
a223fdb8d3
DOCS - Separate parameter names in exceptions in a clear fashion ( #2577 )
2018-02-20 16:38:47 +00:00
Andras Slemmer
a6a2008bb9
Ignore flaky test
2018-02-20 16:32:50 +00:00
Andras Slemmer
a548942a0a
Merge remote-tracking branch 'origin/master' into aslemmer-merge-19-Feb
2018-02-20 16:12:37 +00:00
Andras Slemmer
25263c20c7
Merge remote-tracking branch 'open/master' into aslemmer-merge-19-Feb
2018-02-20 15:52:09 +00:00
