Merge "Fixed Karaf Distribution javax.annotations conflicts with Jersey"
authorEd Warnicke <eaw@cisco.com>
Thu, 5 Jun 2014 13:36:44 +0000 (13:36 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 5 Jun 2014 13:36:44 +0000 (13:36 +0000)
commit5c23f8b37b10befc3d33d20723e6bf219c37a93d
tree4c1bb3c8c94f622fc69388c57945c1956c69831a
parent049179eddcd78c60b75c622225bc6e291f9c3b3b
parent5b637de36f0668844722a31ecdf3e39d77cbd3e3
Merge "Fixed Karaf Distribution javax.annotations conflicts with Jersey"

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.