From: Ed Warnicke <eaw@cisco.com>
Date: Wed, 2 Apr 2014 23:28:41 +0000 (+0000)
Subject: Merge changes I6bc37e88,I0514b26e
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~286
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5aa059de760149de263e9068fd87aa38a8f82835;hp=-c

Merge changes I6bc37e88,I0514b26e

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

5aa059de760149de263e9068fd87aa38a8f82835