update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / qa / workunits / rbd / merge_diff.sh

diff --git a/ceph/qa/workunits/rbd/merge_diff.sh b/ceph/qa/workunits/rbd/merge_diff.sh
index 0b6643dfa54762b8d2e500d224a6c231bcfc3eca..eb8597304d0b136fe7772436878042a744040538 100755 (executable)
--- a/ceph/qa/workunits/rbd/merge_diff.sh
+++ b/ceph/qa/workunits/rbd/merge_diff.sh
@@ -1,4 +1,7 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
+set -ex
+
+export RBD_FORCE_ALLOW_V1=1
 
 pool=rbd
 gen=$pool/gen