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)
commit5aa059de760149de263e9068fd87aa38a8f82835
tree6238723f096b1bf41f559cc786697da24e03cbdb
parentce8b227502448c0a18e3dc22362e4b42e589ef35
parent2d980b055ac55f04e2ad370c69d0a477fb552db1
Merge changes I6bc37e88,I0514b26e

* changes:
  Fixed missing keys in sal-compatibility flows.
  Bug 508: Fixed concurrent conflicting commits by InventoryManager.