ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-07 19:34:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #6479 from corda/vkolomeyko/os-4.4-os-4.5-merge

Browse Source 
NOTICK: OS 4.4 -> OS 4.5 merge
This commit is contained in:
Matthew Nesbit 2020-07-20 13:58:00 +01:00 committed by GitHub
commit 2a84108e13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.ci/dev/regression/Jenkinsfile vendored
View File

@ -18,6 +18,7 @@ killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
* Sense environment
*/
boolean isReleaseTag = (env.TAG_NAME =~ /^release-.*(?<!_JDK11)$/)
boolean isInternalRelease = (env.TAG_NAME =~ /^internal-release-.*$/)
/*
** calculate the stage for NexusIQ evaluation
** * build for snapshots
@ -159,7 +160,7 @@ pipeline {
stage('Publish Release to Docker Hub') {
when {
expression { isReleaseTag }
expression { !isInternalRelease && isReleaseTag }
}
steps {
withCredentials([

2
testing/node-driver/src/main/java/net/corda/testing/driver/SharedMemoryIncremental.java
View File

@ -17,7 +17,7 @@ import java.nio.channels.FileChannel;
* import sun.misc.Unsafe;
* import sun.nio.ch.DirectBuffer;
*/
class SharedMemoryIncremental extends PortAllocation {
public class SharedMemoryIncremental extends PortAllocation {
static private final int DEFAULT_START_PORT = 10_000;
static private final int FIRST_EPHEMERAL_PORT = 30_000;