Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 049179e 5b637de)
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)

Trivial merge
OpenDaylight controller