Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 797ebcb 1ed653e)
Merge "Introducing simple merge strategy for config subsystem"
authorTony Tkacik <ttkacik@cisco.com>
Fri, 11 Jul 2014 11:35:41 +0000 (11:35 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 11 Jul 2014 11:35:41 +0000 (11:35 +0000)

Trivial merge
OpenDaylight controller