This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a1f547a011038296a2125586cbb8c8d18d249455
Merge: 1d1b3321416 56f0448f0d4
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Fri Feb 9 00:10:34 2024 +0530
Merge remote-tracking branch 'origin/4.18' into 4.19
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
.../kvm/storage/LinstorStorageAdaptor.java | 28 +++++++++++++++-------
1 file changed, 19 insertions(+), 9 deletions(-)
