Code Review / vpnservice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 8cc6e1c fe7ad1b)
Merge "Do not override odlparent properties."
authorVivek Srivastava <vivek.v.srivastava@ericsson.com>
Fri, 24 Apr 2015 10:48:01 +0000 (10:48 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 24 Apr 2015 10:48:01 +0000 (10:48 +0000)

Trivial merge