From: Ed Warnicke Date: Thu, 5 Jun 2014 13:36:44 +0000 (+0000) Subject: Merge "Fixed Karaf Distribution javax.annotations conflicts with Jersey" X-Git-Tag: release/helium~709 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5c23f8b37b10befc3d33d20723e6bf219c37a93d Merge "Fixed Karaf Distribution javax.annotations conflicts with Jersey" --- 5c23f8b37b10befc3d33d20723e6bf219c37a93d