From f6f98f1fe905443eacbfb036f1b6ff6c6f5d5261 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Wed, 25 May 2011 09:00:13 -0700
Subject: dist-sched-2a merge

---
 nova/api/openstack/zones.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index 78715f1cc..29b7b2279 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -26,9 +26,6 @@ from nova.scheduler import api
 
 
 FLAGS = flags.FLAGS
-flags.DEFINE_string('build_plan_encryption_key',
-        None,
-        '128bit (hex) encryption key for scheduler build plans.')
 
 
 LOG = logging.getLogger('nova.api.openstack.zones')
-- 
cgit