From 6813598839152bba1d04fe0144e54fcd1988e706 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem.os@gmail.com>
Date: Mon, 8 Oct 2018 17:44:41 -0400
Subject: [PATCH] Update git submodules

* Update nova from branch 'master'
  - Remove redundant conductor from ServersTestBase.setUp()

    ServersTestBase.setUp() is starting a second conductor
    service for no reason. Its parent class, _IntegratedTestBase,
    already starts a conductor service and stores it as an instance
    variable. So this change removes the redundant conductor service
    from the setUp method.

    Change-Id: If29587a22eb2e217bb9b6c93524c83bfff765e53
---
 nova | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova b/nova
index 1d1b0d5736..387d5a9835 160000
--- a/nova
+++ b/nova
@@ -1 +1 @@
-Subproject commit 1d1b0d573671add8630af41754e5521cb2bc5ae1
+Subproject commit 387d5a9835699ac6354a92984df02c3d2f75df10