merge from ridge and vl
drwxr-xr-x - ctdb