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)
commit56944c29e653ba98ce6566c814bcd165089af103
tree525c08aa381e6270be66c9d5a7243665477204cd
parent636f54dacd4f09212bf8178df6311a9e13a0e73f
parent960027b3795f7e39e0ec6913d9e070e106e8e45c
Merge changes If2ef6c5c,I4b8e0a28

* changes:
  Fix nsh flow
  fix for missing sfc feature