Merge "Control update, delete for cisco-network-profile"

author Jenkins <jenkins@review.openstack.org>

Mon, 16 Jun 2014 04:57:32 +0000 (04:57 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 16 Jun 2014 04:57:32 +0000 (04:57 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 16 Jun 2014 04:57:32 +0000 (04:57 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 16 Jun 2014 04:57:32 +0000 (04:57 +0000)
diff --cc neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 16 Jun 2014 04:57:32 +0000 (04:57 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 16 Jun 2014 04:57:32 +0000 (04:57 +0000)