Waldemar Zurowski
|
ef76ae0973
|
NOTICK: Merging forward updates from OS 4.5 to OS 4.6 (2022-05-25)
Conflicts:
*
client/rpc/src/integration-test/kotlin/net/corda/client/rpcreconnect/CordaRPCClientReconnectionTest.kt
*
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
* constants.properties
* gradle/wrapper/gradle-wrapper.properties
* tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
|
2022-05-25 10:14:38 +02:00 |
|
Ronan Browne
|
ca087980a9
|
Merge pull request #7182 from corda/wz/merge-os-44-45-2022-05-24
NOTICK: Merging forward updates from OS 4.4 to OS 4.5
|
2022-05-24 17:44:00 +01:00 |
|
Waldemar Zurowski
|
bb54f77e09
|
Merge branch 'release/os/4.4' into wz/merge-os-44-45-2022-05-24
|
2022-05-24 16:48:08 +02:00 |
|
Waldemar Żurowski
|
589c714cba
|
CORE-4784: Generate license and wiki reports (#7181)
|
2022-05-24 16:45:09 +02:00 |
|
Ronan Browne
|
5d1599b97c
|
Merge pull request #7118 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.6
INFRA-1699: Update Gradle wrapper URL
|
2022-05-23 17:11:57 +01:00 |
|
Ronan Browne
|
0bf29d238c
|
Merge pull request #7117 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.7
INFRA-1699: Update Gradle wrapper URL
|
2022-05-23 17:11:34 +01:00 |
|
Ronan Browne
|
0faeae6982
|
Merge pull request #7119 from corda/ronanb/INFRA-1699/tidy-up-wrapper-4.5
INFRA-1699: tidy up Gradle wrapper URL
|
2022-05-23 17:11:13 +01:00 |
|
Adel El-Beik
|
3c70454d86
|
Merge pull request #7173 from corda/ENT-6511-gracefulShutdown-backport-from-4.6
ENT-6511: graceful shutdown backport from 4.6
|
2022-05-16 14:21:05 +01:00 |
|
Ryan Fowler
|
a5a0c64e2d
|
CORDA-3918: Port of ENT-5417: Allow exceptions to propagate when shutdown commands are called (#6516)
|
2022-05-16 10:06:01 +01:00 |
|
Tamas Veingartner
|
bfcd1d8791
|
ENT-5379 Reconnecting RPC fixed to recognize shutdown calls and break reconnect attempts (#6316)
|
2022-05-16 10:06:00 +01:00 |
|
Ronan Browne
|
4d16d94848
|
Merge pull request #7167 from corda/connelm/INFRA-1743/release-email-notification4.7
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 18:15:44 +01:00 |
|
Ronan Browne
|
58661bc2bf
|
Merge pull request #7170 from corda/connelm/INFRA-1743/release-email-notifications4.4
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 17:36:45 +01:00 |
|
Ronan Browne
|
ce672f50dd
|
Merge pull request #7169 from corda/connelm/INFRA-1743/release-email-notifications4.5
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 17:36:35 +01:00 |
|
Ronan Browne
|
b458d37f0b
|
Merge pull request #7168 from corda/connelm/INFRA-1743/release-email-notifications4.6
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 17:36:15 +01:00 |
|
Connel McGovern
|
bbb6b1a51d
|
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 14:26:04 +01:00 |
|
Connel McGovern
|
ab19a61169
|
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 14:25:07 +01:00 |
|
Connel McGovern
|
bdf96634ee
|
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 14:24:25 +01:00 |
|
Connel McGovern
|
e8e46a220a
|
NOTICK Remove Slack tagging on successful/unstable builds
|
2022-05-11 14:23:35 +01:00 |
|
Ronan Browne
|
75ddc62902
|
Merge pull request #7132 from corda/connelm/INFRA-1743/release-email-notification4.7
INFRA-1743 Activate C4 email notifications Open source and Ent
|
2022-05-10 17:13:46 +01:00 |
|
Ronan Browne
|
43146e5d2a
|
Merge pull request #7162 from corda/connelm/INFRA-1743/release-email-notifications4.6
INFRA-1743 Slack & E-mail notification
|
2022-05-10 17:13:21 +01:00 |
|
Ronan Browne
|
4dc26b8f91
|
Merge pull request #7161 from corda/connelm/INFRA-1743/release-email-notifications4.5
INFRA-1743 Slack & E-mail notification
|
2022-05-10 09:57:28 +01:00 |
|
Ronan Browne
|
3f22575f8e
|
Merge pull request #7160 from corda/connelm/INFRA-1743/release-email-notifications4.4
INFRA-1743 Slack & E-mail notification
|
2022-05-09 18:35:23 +01:00 |
|
Adel El-Beik
|
c174135a05
|
Merge pull request #7163 from corda/adel/ENT-6765-quasar
ENT-6765: Upgraded quassar and hibernate.
|
2022-05-09 16:51:37 +01:00 |
|
Connel McGovern
|
6484945513
|
Update Jenkinsfile
|
2022-05-09 16:16:44 +01:00 |
|
Connel McGovern
|
48980134c9
|
Update Jenkinsfile
|
2022-05-09 16:16:32 +01:00 |
|
Connel McGovern
|
c30e7be3a7
|
Update Jenkinsfile
|
2022-05-09 16:16:20 +01:00 |
|
Connel McGovern
|
1888ed6ba1
|
Update Jenkinsfile
|
2022-05-09 16:16:08 +01:00 |
|
Adel El-Beik
|
e33265f60d
|
ENT-6765: Upgraded quassar and hibernate.
|
2022-05-09 13:36:16 +01:00 |
|
Connel McGovern
|
7a7a8c8e2b
|
INFRA-1743 E-mail & Slack notifications
|
2022-05-09 13:22:33 +01:00 |
|
Connel McGovern
|
cd8ecac19e
|
INFRA-1743 Slack & E-mail notification
|
2022-05-09 13:17:58 +01:00 |
|
Connel McGovern
|
5149889b34
|
INFRA-1743 Slack & E-mail notification
|
2022-05-09 13:16:38 +01:00 |
|
Connel McGovern
|
56581b340a
|
INFRA-1743 Slack & E-mail notification
|
2022-05-09 13:15:27 +01:00 |
|
Adel El-Beik
|
6592920aeb
|
Merge pull request #7150 from corda/adel/merge-from-os-4.5-5Apr
NOTICK: Merge from OS 4.5
|
2022-04-06 10:02:08 +01:00 |
|
Adel El-Beik
|
6d2a9931af
|
NOTICK: Reverted Jenkins.nightly.
|
2022-04-05 18:07:25 +01:00 |
|
Adel El-Beik
|
6023482412
|
Merge remote-tracking branch 'origin/release/os/4.5' into adel/merge-from-os-4.5-5Apr
|
2022-04-05 18:02:16 +01:00 |
|
Adel El-Beik
|
a99a25fcf7
|
Merge pull request #7149 from corda/adel/merge-from-os4.4-4Apr
NOTICK: Merge from OS 4.4
|
2022-04-05 17:02:51 +01:00 |
|
Adel El-Beik
|
52451fcb6e
|
NOTICK: Reverted file in merge.
|
2022-04-05 14:31:17 +01:00 |
|
Adel El-Beik
|
4fba67b8c5
|
Merge remote-tracking branch 'origin/release/os/4.4' into adel/merge-from-os4.4-4Apr
|
2022-04-05 14:25:59 +01:00 |
|
Adel El-Beik
|
ee55da42fd
|
Merge pull request #7147 from corda/adel/merge-from-4.3-4Apr
NOTICK: Merge from OS 4.3
|
2022-04-05 14:17:11 +01:00 |
|
Adel El-Beik
|
2e47c4ea43
|
Merge remote-tracking branch 'origin/release/os/4.3' into adel/merge-from-4.3-4Apr
|
2022-04-04 10:32:15 +01:00 |
|
Adel El-Beik
|
4de36292c3
|
Merge pull request #7143 from corda/adel/CORDA-4239-43
CORDA-4239: Regenerate test certificates with 10yr validity.
|
2022-04-04 10:08:38 +01:00 |
|
Adel El-Beik
|
9e99af2355
|
CORDA-4239: Regenerate test certificates with 10yr validity.
|
2022-04-01 17:38:00 +01:00 |
|
Adel El-Beik
|
579c66dd7e
|
Merge pull request #7138 from corda/adel/CORDA-4239
CORDA-4239: Regenerate test certificates with 10yr validity.
|
2022-03-31 12:45:26 +01:00 |
|
Adel El-Beik
|
6c11184eae
|
CORDA-4239: Regenerate test certificates with 10yr validity.
|
2022-03-30 16:35:40 +01:00 |
|
Ronan Browne
|
1001926075
|
Merge pull request #7133 from corda/connelm/INFRA-1743/release-email-notification4.6
INFRA-1743 Activate C4 email notifications Open source and Ent
|
2022-03-25 17:33:19 +00:00 |
|
Ronan Browne
|
b5d11e7e2f
|
Merge pull request #7134 from corda/connelm/INFRA-1743/release-email-notification4.5
INFRA-1743 Activate C4 email notifications Open source and Ent
|
2022-03-25 17:33:06 +00:00 |
|
Ronan Browne
|
475acb6495
|
Merge pull request #7135 from corda/connelm/INFRA-1743/release-email-notification4.4
INFRA-1743 Activate C4 email notifications Open source and Ent
|
2022-03-25 17:32:52 +00:00 |
|
Ronan Browne
|
c7d586da28
|
Merge pull request #7124 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.4
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
|
2022-03-23 17:13:58 +00:00 |
|
Ronan Browne
|
4802c7bc51
|
Merge pull request #7125 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.5
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
|
2022-03-23 17:13:43 +00:00 |
|
Ronan Browne
|
44a5654c40
|
Merge pull request #7126 from corda/connelm/ENT-6716/disable-publish-dockerhub-patch4.6
ENT-6716 Remove Corda OS image publishing to Docker hub for CE4.8.x patches and below
|
2022-03-23 17:13:28 +00:00 |
|