Merge changes I05e784af,Ie975a2ec
[controller.git] / opendaylight / distribution / opendaylight-karaf / src / main / resources / etc /
drwxr-xr-x   ..
-rw-r--r-- 5173 custom.properties