tree d43db1d0f7ca56c5f088eaef60ee1b7f18060fa4
parent 8f12d7d18ab4429b98951599dba073e192879604
parent 6c9e2da09c5e46658aa5e1eda573b37fbb5e7b1f
author Jon Hall <jhall@opennetworking.org> 1542132549 +0000
committer Gerrit Code Review <gerrit@onosproject.org> 1542132549 +0000

Merge "Karaf 4.2 changes"