From 248221a4538c8312a6ea132c52f448106470e7e7 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 27 Sep 2011 11:25:18 -0700
Subject: [PATCH] bring novaclient back to master

---
 stackrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stackrc b/stackrc
index e9c2af927c..2d265d3057 100644
--- a/stackrc
+++ b/stackrc
@@ -24,7 +24,7 @@ NIXON_BRANCH=diablo
 
 # python client library to nova that dashboard (and others) use
 NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git
-NOVACLIENT_BRANCH=rackspace_master
+NOVACLIENT_BRANCH=master
 
 # openstackx is a collection of extensions to openstack.compute & nova
 # that is *deprecated*.  The code is being moved into python-novaclient & nova.