Merge changes I4ec0efd7,Ia2619921
authorTony Tkacik <ttkacik@cisco.com>
Wed, 7 Jan 2015 09:38:58 +0000 (09:38 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 7 Jan 2015 09:38:59 +0000 (09:38 +0000)
* changes:
  Implement basic locking for candidate in config-netconf-connector
  Improve error reporting in ServiceRegistry


Trivial merge

©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.