Commit 1f0f1ade by Guba Sándor

adding merge to tasks

parent e1497ebf
......@@ -26,6 +26,13 @@ def snapshot(json_data):
def merge(old_json, new_json):
disk = Disk.import_from_json(old_json)
new_disk = Disk.import_from_json(new_json)
def get_disk(json_data):
disk = Disk.get(dir=json_data['dir'], name=json_data['name'])
return disk.get_desc()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment