import 15.2.5

[ceph.git] / ceph / src / ceph-volume / ceph_volume / util / __init__.py

diff --git a/ceph/src/ceph-volume/ceph_volume/util/__init__.py b/ceph/src/ceph-volume/ceph_volume/util/__init__.py
index 43c9c9d6835d11b53070ac6b7386364b9f637a30..1b5afe97040fbb83812c9a3fc3316ded206c7cbf 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/util/__init__.py
+++ b/ceph/src/ceph-volume/ceph_volume/util/__init__.py
@@ -98,3 +98,11 @@ def prompt_bool(question, input_=None):
         terminal.error('Valid false responses are: n, no')
         terminal.error('That response was invalid, please try again')
         return prompt_bool(question, input_=input_prompt)
+
+def merge_dict(x, y):
+    """
+    Return two dicts merged
+    """
+    z = x.copy()
+    z.update(y)
+    return z
\ No newline at end of file