This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/bin/swift-init b/bin/swift-init | |
index 3c992f7..c5c3e8c 100755 | |
--- a/bin/swift-init | |
+++ b/bin/swift-init | |
@@ -17,6 +17,8 @@ | |
import sys | |
from optparse import OptionParser | |
+from swift.openstack.common.report import guru_meditation_report as gmr | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py | |
index 6d30822..0ce9c47 100644 | |
--- a/nova/cmd/novncproxy.py | |
+++ b/nova/cmd/novncproxy.py | |
@@ -24,11 +24,11 @@ import os | |
import sys | |
from oslo.config import cfg | |
+import websockify | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/nova/compute/manager.py b/nova/compute/manager.py | |
index 9aa21a1..07cfdc8 100644 | |
--- a/nova/compute/manager.py | |
+++ b/nova/compute/manager.py | |
@@ -3185,9 +3185,11 @@ class ComputeManager(manager.Manager): | |
block_device_info = self._get_instance_volume_block_device_info( | |
context, instance) | |
+ shared_storage = self._is_instance_storage_shared(context, instance) | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py | |
index 6d30822..0ce9c47 100644 | |
--- a/nova/cmd/novncproxy.py | |
+++ b/nova/cmd/novncproxy.py | |
@@ -24,11 +24,11 @@ import os | |
import sys | |
from oslo.config import cfg | |
+import websockify | |
from nova import config | |
from nova.console import websocketproxy |
NewerOlder