Merge changes If2ef6c5c,I4b8e0a28
authorSam Hague <shague@redhat.com>
Wed, 4 Nov 2015 01:48:46 +0000 (01:48 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 4 Nov 2015 01:48:46 +0000 (01:48 +0000)
commite1dcbafc2cb3a7c8996718961a3a91b0f086da0c
treefe0572d0817ff3ba00e17926bb99aa0258cedf7b
parentef8ebdb2c3f767204c47a2f844cdfd0fd47d791a
parent90bd144e9d32f9b44bd9dfffa5a469bc235d0725
Merge changes If2ef6c5c,I4b8e0a28

* changes:
  Fix nsh flow
  fix for missing sfc feature