0d18bf8e33
Merge up of cleanup of AMQP protocol code
2018-07-03 17:05:05 +01:00
15d868b113
Merge up of cleanup of AMQP protocol code
2018-07-03 17:04:42 +01:00
d0568121b7
Some code tidy up ahead of post-GA development. ( #3500 )
...
Handle SSL Handshake timeouts properly
2018-07-03 14:16:31 +01:00
13d7892ded
Merge commit 'a5f43110f01c1bb116bb13274f1046204ee76e5f' into christians/merge-CORDA-1710
2018-07-03 13:05:39 +01:00
95d1b1f84e
ENT-2001 use versionInfo when registering node with the doorman ( #3435 )
...
* ENT-2001 use versionInfo when registering node with the doorman
* ENT-2001 address code review changes
2018-07-03 09:16:48 +01:00
d5ebb6da4f
gradle magic to publish installer
2018-07-02 18:01:08 +01:00
139ebf7977
Merge pull request #1164 from corda/fix_installer_build
...
ENT-2193 fix issue with base-directory not being set
2018-07-02 17:27:37 +01:00
0f98a1cbcd
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-07-02 11:31:18 +01:00
2b6018f050
Merge pull request #3473 from corda/fix_flaky_test
...
[CORDA-1698] Fix flaky test
2018-06-29 16:26:24 +01:00
b129a44271
Merge pull request #1087 from corda/add_licence_to_installer_2
...
ENT-2098 add license acceptance step to installer
2018-06-29 15:58:08 +01:00
3b6fd50244
fix issue with base-directory not being set
...
fix build issue with installer.sh not containing security.policy from JRE^
2018-06-29 15:35:00 +01:00
43e934beb3
ENT-2194 - Fix badly formatted characters in startup banner ( #1142 )
2018-06-29 10:03:17 +01:00
136500d48d
Advance TestClock instead of sleeping.
2018-06-28 17:58:46 +01:00
61d9d475c8
Advance TestClock instead of sleeping.
2018-06-28 17:14:50 +01:00
8df18e954f
ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries ( #1101 )
...
* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries
ENT-1880 Move identity key generation to network registration process
(cherry picked from commit c3ac203
2018-06-28 15:20:22 +01:00
c3ac203251
ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries ( #1101 )
...
* ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries
ENT-1880 Move identity key generation to network registration process
2018-06-28 15:10:52 +01:00
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
85439aee57
add license acceptance step to installer
2018-06-27 09:55:52 +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
