Jose Coll
b47d5ec5c7
Merge branch 'release/os/4.12' into merge-release/os/4.11-release/os/4.12-2023-12-15-79
2023-12-19 08:46:52 +00:00
r3-build
a475c275db
Merging forward updates from release/os/4.10 to release/os/4.11 - 2023-12-15
2023-12-15 11:41:19 +00:00
r3-build
27759ea74f
Merging forward updates from release/os/4.9 to release/os/4.10 - 2023-12-14
2023-12-14 17:51:03 +00:00
r3-build
40a96c5760
Merging forward updates from release/os/4.8 to release/os/4.9 - 2023-12-14
2023-12-14 17:06:04 +00:00
r3-build
0dbdd08984
Merging forward updates from release/os/4.7 to release/os/4.8 - 2023-12-14
2023-12-14 15:30:28 +00:00
Maciej Swierad
97310a8895
ENT-11281/Activating forward merge logic
2023-12-14 14:57:13 +00:00
Ronan Browne
1fdc23692a
ES-1351: set up 4.12 branch
2023-09-14 11:13:15 +01:00
Waldemar Zurowski
7175d56f6c
ES-1313: Merging forward updates from release/os/4.10 to release/os/4.11
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-08 09:09:58 +01:00
Waldemar Zurowski
9f395b5ec3
ES-1313: Merging forward updates from release/os/4.9 to release/os/4.10
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 20:36:14 +01:00
Waldemar Zurowski
a7274c4ec2
ES-1313: Merging forward updates from release/os/4.8 to release/os/4.9
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 18:30:28 +01:00
Waldemar Zurowski
fd55e4c8d4
ES-1313: Merging forward updates from release/os/4.7 to release/os/4.8
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 16:08:20 +01:00
Waldemar Zurowski
1c903b0ff2
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 14:06:10 +01:00
Waldemar Żurowski
dfe0ed294e
ES-1313: changes for better future forward merges ( #7486 )
...
* add more comments as a form of documentation
* move variable names away from calling pipeline for better experience
of future forward merges if pipeline parameters were to change
2023-09-07 14:39:02 +02:00
Waldemar Zurowski
658e7217a3
ES-1313: Merging forward updates from release/os/4.6 to release/os/4.7
...
Conflicts:
* .ci/dev/forward-merge/Jenkinsfile
2023-09-07 11:27:57 +01:00
Ronan Browne
8e2115293a
ES-1313: Update Jenkinsfile for slack channel ( #7484 )
2023-09-07 11:49:33 +02:00
Waldemar Żurowski
d7a5428665
Updated for new branch
2023-09-04 12:08:52 +01:00
Waldemar Żurowski
8a01b25684
updated forward merger for current branch
...
* updated originBranch to match current branch
* updated targetBranch to match branch with the next version
19:11
2023-09-01 22:50:29 +02:00
Waldemar Żurowski
3a093ef324
updated forward merged to new branch
2023-09-01 18:25:46 +02:00
Waldemar Żurowski
3d8636c716
updated for new branch
2023-09-01 14:55:04 +02:00
Waldemar Żurowski
267b500c93
updated forward merged to new branch
2023-09-01 11:56:24 +02:00
Waldemar Żurowski
b0f86e26f9
ES-412: added automatic forward merge for Corda 4 ( #7469 )
...
* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
2023-09-01 10:50:47 +01:00
