Merge changes I4ec0efd7,Ia2619921
[controller.git] / karaf / opendaylight-karaf-resources / src / main / resources / etc /
drwxr-xr-x   ..
-rw-r--r-- 6191 custom.properties