c139b160eb
Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45
2018-06-28 10:53:10 +01:00
e2f657d679
ENT-2124 Flush before detach in Hibernate ( #3465 )
2018-06-28 10:51:28 +01:00
c32b7b1331
Node API: relocate licence file ( #1100 )
2018-06-28 10:11:41 +01:00
b09368a17a
Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45
...
# Conflicts:
# docs/source/getting-set-up.rst
# docs/source/node-database.rst
2018-06-28 09:51:11 +01:00
84a86d32b7
Fixed broken smoke test caused by no notaries in the network parameters ( #3461 )
...
For now the workaround is to manually select the notary. The proper solution is to add notaries to the network parameters in smoke tests.
2018-06-28 09:43:29 +01:00
322a8d4f54
ENT-2124 Flush before detach in Hibernate ( #3462 )
2018-06-28 09:25:56 +01:00
34923506f4
CORDA-1686: Make "rpc-client-sender" daemon ( #3455 )
...
Such that they do not prevent application that started them from exiting.
2018-06-28 08:53:30 +01:00
4e52a957d1
Minor: better error message when the config file isn't found ( #3460 )
2018-06-27 21:15:11 +01:00
e401eb604d
Fixed CordaRPCClient test to avoid potential flakiness ( #3459 )
2018-06-27 20:23:26 +01:00
eee2563bfa
CORDA-1660: Wiring up the CordaRPCClient class loader to the p2p serialisation context. ( #3454 )
...
This is to allow the standalone shell to be able to receive WireTransactions containing Cash.State objects.
2018-06-27 17:02:35 +01:00
f51407cd5d
Add comment about schema search path ( #3444 )
2018-06-27 16:48:46 +01:00
4cc4e3f01b
Fix DemoBench Windows installer ( #3451 )
...
Specify paths to build tools correctly or else bugfixes will not applied.
2018-06-27 16:45:39 +01:00
75e30c8114
CORDA-1610: Retain progress tracker during flow retry - multithreaded SMM ( #1049 )
...
* Test to show progress tracker losing updates when a flow is retried.
* Fix the injection logic - attach the new children to the old progress tracker
2018-06-27 16:14:25 +01:00
20c53a5a45
ENT-2133 Explorer demo nodes fix ( #1091 ) ( #1098 )
2018-06-27 16:09:49 +01:00
72a29101c3
ENT-2147 HA doc review ( #1096 )
...
* Corda to Corda Enterprise, remove CE source mention, CRL((certificate revocation list)
2018-06-27 16:08:22 +01:00
8c956c004f
Removes links to Corda source and templates ( #3456 )
2018-06-27 15:29:57 +01:00
8e75e78705
Merge pull request #1095 from corda/add_terms_to_splash
...
ENT-2098 add print out of terms-of-use to node startup
2018-06-27 15:08:26 +01:00
75354d2961
Merge pull request #1094 from corda/thomas/os-merge-2018-06-27
...
OS merge
2018-06-27 14:40:14 +01:00
99e314d017
ENT-2145: Configure DemoBench nodes to issue selected currencies. ( #3452 )
2018-06-27 14:01:49 +01:00
1ff95c1916
add print out of terms-of-use to node startup
2018-06-27 13:23:31 +01:00
eb698160fa
Merge remote-tracking branch 'open-source/master' into thomas/os-merge-2018-06-27
2018-06-27 13:00:37 +01:00
66cb0e389b
Warning timer thread should run as a daemon ( #3450 )
2018-06-27 12:57:37 +01:00
7e05e373d7
CORDA-1687: Remove unwanted hibernate-core from DemoBench and Node Explorer. ( #3449 )
2018-06-27 12:52:36 +01:00
3eef73020a
Update CONTRIBUTORS.md
2018-06-27 12:10:22 +01:00
283d232784
Merge pull request #1090 from corda/andrius/os-merge-06-27
...
Andrius/os merge 06 27
2018-06-27 12:07:59 +01:00
4281061c47
Merge remote-tracking branch 'open/master' into andrius/os-merge-06-27
2018-06-27 10:41:28 +01:00
fdf267d735
TimedFlowTests: remove progress tracker completion timeout ( #3448 )
2018-06-27 10:39:28 +01:00
85439aee57
add license acceptance step to installer
2018-06-27 09:55:52 +01:00
968fcc718a
Improve participants JavaDocs. ( #3429 )
...
* Improve participants JavaDocs.
* Wording consistent with terminology.
2018-06-27 09:39:56 +01:00
f529a2a88e
Update CONTRIBUTORS.md
2018-06-27 09:32:59 +01:00
e3072ad320
Remove old TODO to upgrade Artemis to version 2.4+ ( #3447 )
2018-06-27 09:02:45 +01:00
8ecf3b5e49
CORDA-1685: Remove bank-of-corda.jar from DemoBench. ( #3446 )
2018-06-26 22:53:22 +01:00
be1aff20a6
CORDA-1610: In addition to injecting the old progress tracker after flow retry, attach and re-subscribe to child trackers as well. ( #3440 )
2018-06-26 17:50:08 +01:00
a60cd9d356
ENT-2131 Add comment about schema search path for PostgreSQL ( #1080 )
...
* Add documentation for schema search path
2018-06-26 17:25:43 +01:00
ad2890193d
Specify Notary in CashIssueAndPaymentFlow and PaymentRequest ( #3443 )
...
* Specify notary in CashIssueAndPaymentFlow
* Specify notary in PaymentRequest
* Address comments
* Default to the first notary in the `CashPaymentFlow`
2018-06-26 16:45:18 +01:00
a58eac6172
Merge pull request #1079 from corda/kat-merge-20180626
...
OS -> Ent merge
2018-06-26 16:27:43 +01:00
9258b0e63b
Minor: TimedFlowTests are sometimes flaky in CI since the flow result… ( #3441 )
...
Minor: TimedFlowTests are sometimes flaky in CI since the flow result future completes before the progress tracker is set to DONE. Instead of checking the progress tracker step immediately, wait for it with explicit timeout.
2018-06-26 16:07:08 +01:00
79626e9c4c
[CORDA-1598] Make argument parsing more consistent. ( #3423 )
...
We parse command line arguments twice, once in `CordaCaplet.java`
to determine the config file and base directory, and then again
in NodeArgsParser. NodeArgsParser accepts long options with a
single hyphen, while CordaCaplet did not. This changes
CordaCaplet to accept `--config-file` as well as `-config-file`,
same for base-dir.
2018-06-26 14:32:45 +01:00
35e9396ce3
Gradle fixes for JMeter capsule: ( #1077 )
...
- Consistent Log4J artifacts
- Depends on processResources task
- Include as dependency of assemble task
2018-06-26 13:45:32 +01:00
1eedaaa45f
Fix merge - add missing entry in bintrayConfig
2018-06-26 13:36:39 +01:00
b4d31b1c77
Upgrade Gradle wrapper JAR. ( #3439 )
2018-06-26 12:46:33 +01:00
7a2c15fc5e
Merge remote-tracking branch 'open/master' into kat-merge-20180626
2018-06-26 12:27:24 +01:00
a4d2acbea2
ENT-1467: Make the deterministic JDK image compatible with IntelliJ. ( #3416 )
...
* Expand the deterministic JDK image to make it friendlier to IntelliJ.
* Fix Gradle always to use the latest deterministic rt.jar available.
* Write JDK items directly from Gradle.
2018-06-26 11:53:16 +01:00
2497b0b90a
Merge pull request #1073 from corda/mkit-os-ent-merge
...
OS -> ENT Merge e00c7706c3
2018-06-26 11:49:06 +01:00
4ea8091667
CORDA-1670 fix multiple CorDapps for flow check ( #3436 )
...
* CORDA-1670 fix multiple CorDapps for flow check
* CORDA-1670 fix multiple CorDapps for flow check
* CORDA-1670 address code review comment
2018-06-26 11:32:49 +01:00
ab37686ba0
[ENT-2135]: Reigning in the over-ambitious flow framework default thread pool size ( #1075 )
2018-06-26 11:26:19 +01:00
a70ed52e87
Finding the replica with the most advanced replication index ( #1072 )
2018-06-26 11:07:16 +01:00
1d95ffba3a
CORDA-1674 - Publish Node Explorer artefact ( #3437 )
2018-06-26 10:46:04 +01:00
14810f25de
Fix warning for lambda. ( #3438 )
2018-06-26 10:44:08 +01:00
d060e95834
Merge OS -> ENT up to e00c7706c3
2018-06-26 10:02:33 +01:00
