Merge changes I6bc37e88,I0514b26e
authorEd Warnicke <eaw@cisco.com>
Wed, 2 Apr 2014 23:28:41 +0000 (23:28 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 2 Apr 2014 23:28:41 +0000 (23:28 +0000)
* changes:
  Fixed missing keys in sal-compatibility flows.
  Bug 508: Fixed concurrent conflicting commits by InventoryManager.


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.