b54292859a
Increase timeout in TimedFlowMultiThreadedSMMTests ( #1119 )
2018-06-28 13:36:45 +01:00
992d6022d3
Merge pull request #1114 from corda/merges/june-28-09-45
...
Merges: June 28th at 09:45
2018-06-28 11:45:11 +01:00
bbd4b3b944
Revert "Merges: June 28th at 09:45 ( #1109 )"
...
This reverts commit e5ebf04c0f
2018-06-28 11:34:48 +01:00
e5ebf04c0f
Merges: June 28th at 09:45 ( #1109 )
2018-06-28 11:26:38 +01:00
7d6f08d578
Merge remote-tracking branch 'remotes/open/master' into merges/june-28-09-45
2018-06-28 11:25:53 +01:00
a768904e4e
CORDA-1695 Include thread ID in flow logging MDC ( #3463 )
2018-06-28 11:24:54 +01:00
f663a84377
Minor spelling and grammatical fixes
2018-06-28 12:22:05 +02:00
c9e80451a8
Improve the Enterprise README file a bit.
2018-06-28 12:22:05 +02:00
8a70cd1ba4
Improve tarball packaging.
...
1) Fix path bug that breaks tarball build task on Mint Linux
2) Tarballs conventionally contain a single top level directory, to avoid
extraction dumping things into the current directory unexpectedly.
2018-06-28 12:22:05 +02:00
cedfb3f069
Change flow executor thread names to be the same ( #1111 )
2018-06-28 11:07:28 +01:00
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
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
322a8d4f54
ENT-2124 Flush before detach in Hibernate ( #3462 )
2018-06-28 09:25:56 +01:00
4e52a957d1
Minor: better error message when the config file isn't found ( #3460 )
2018-06-27 21:15:11 +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
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
1ff95c1916
add print out of terms-of-use to node startup
2018-06-27 13:23:31 +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
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
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
7a2c15fc5e
Merge remote-tracking branch 'open/master' into kat-merge-20180626
2018-06-26 12:27:24 +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
d060e95834
Merge OS -> ENT up to e00c7706c3
2018-06-26 10:02:33 +01:00
e00c7706c3
CORDA-1661 Reverting DEV certificates ( #3422 )
...
* CORDA-1661 Reverting DEV certificates
* Addressing review comments
* Removed the intermediate certificate from the trust store and added some test cases for the revocation check
2018-06-25 16:40:51 +01:00
868763f82b
Fix for running tests from Idea ( #3425 )
2018-06-25 15:15:52 +01:00
9be4c5dca4
CORDA-1567 Remove all traces of the out-of-process verifier ( #3424 )
2018-06-25 13:01:33 +01:00
34e52551fd
[CORDA-1663]: Node won't start if cordapps generate states prior to deletion (fix). ( #3432 )
2018-06-25 11:59:43 +01:00
98cd8be160
Merge remote-tracking branch 'open/master' into os-merge-b97af47
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/release-notes.rst
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
# tools/bootstrapper/build.gradle
2018-06-25 11:38:30 +01:00
b97af477b2
CORDA-1603: Class carpenter able to synthesis Cash.State objects ( #3400 )
...
This requires the class carpenter to be able to run in a "lenient" mode where it permits synthesised classes to implement interfaces with unimplemented methods.
2018-06-25 11:33:37 +01:00
7d975a43e0
Merge pull request #1058 from corda/chrisr3-os-merge
...
Merge from Open Source.
2018-06-23 17:32:27 +01:00
3046843d40
CORDA-1602: Added cmd line flags to the network bootstrapper ( #3419 )
...
The list of CorDapps jars is no longer passed in via the cmd line but is now expected to be placed in the bootstrapped directory.
Ended up being a bit of a refactor to cater for unit testing, and also tidied up the bootstrapper docs.
2018-06-23 11:36:10 +01:00
8b3a5432cb
Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge
2018-06-23 00:06:11 +01:00
2fe5bae8a7
ENT-1953 enterprise tuning config ( #1057 )
...
* ENT-1953 enterprise tuning config
* Keep flowThreadPoolSize at 1 for integration tests as some expect certain ordering it seems.
* Log thread count for SMM
2018-06-22 16:39:17 +01:00
465915ac83
[ENT-1289] Exit node if db down ( #918 )
...
* Exit if the db connection is lost
2018-06-22 14:57:43 +01:00
1905f23093
fix merge
2018-06-21 16:51:58 +01:00
fb3e216318
Merge remote-tracking branch 'open/master' into tudor-merge-21-06
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-06-21 16:51:19 +01:00
66b67b231a
[CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option… ( #3394 )
...
* [CORDA-1597] Make the NodeArgsParser fail on unrecognized (non-option) arguments.
* Respond to feedback from anthonykeenan.
2018-06-21 16:50:02 +01:00
381aadc78f
ENT-1796 RPC SSL ( #3401 )
...
* ENT-1796 add just-generate-rpc-ssl-settings command line flag. Fix ssl configuration and documentation
* ENT-1796 small fix. change alias
* ENT-1796 address code review changes
* ENT-1796 revert file
* ENT-1796 Added check to display better error message
* ENT-1796 Doc fixes
2018-06-21 16:46:05 +01:00
62088e4710
Fixes ( #1050 )
2018-06-21 16:35:20 +01:00
d7ee6fc361
Merge pull request #1044 from corda/andrius/merge-06-21-2
...
Andrius/merge 06 21 2
2018-06-21 15:55:05 +01:00
cdd223378e
Fixes ( #1045 )
2018-06-21 15:37:45 +01:00
a9cdb576e6
Merge remote-tracking branch 'open/master' into andrius/merge-06-21-2
2018-06-21 14:02:37 +01:00
227ca3b65b
CORDA-1610: Retain progress tracker during flow retry.
...
Make sure the same progress tracker object is re-used in the restarted flow so subscribers can keep receiving progress updates.
2018-06-21 11:44:13 +01:00
ed3944c546
Create Artemis p2p.inbound addresses before starting the broker ( #3407 )
2018-06-20 16:24:30 +01:00
9b5a099302
ENT-2105: Remove unnecessary sourceSets from integration tests. ( #1029 )
...
The database scripts are already available from the test-utils JAR via the classpath and so don't need
to be included as additional source sets.
2018-06-20 15:38:48 +01:00
