Merge "Have integration use odlparent so we get the same karaf.version as others"
-rw-r--r-- 242 .gitignore
drwxr-xr-x - distributions
drwxr-xr-x - feature-selector
drwxr-xr-x - features
-rw-r--r-- 11108 pom.xml