[openstack-nova/f17: 9/9] maint: adjust update-patches.txt to recent github reorg

[Pádraig Brady]

commit 6f3a594560417da65c2982f14e549fd4cd982e18
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue May 29 21:49:25 2012 +0100

    maint: adjust update-patches.txt to recent github reorg
    
    For consistency with other branches we're using a
    'master-patches' branch on github rather than 'master'
    (which has been deleted), so update the text
    to reflect that.
    (cherry picked from commit 07d1cef67b1148805f0e21f4f3c2adb8a5ab906c)

 update-patches.txt |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/update-patches.txt b/update-patches.txt
index e0cf47c..7d1ab20 100644
--- a/update-patches.txt
+++ b/update-patches.txt
@@ -11,12 +11,12 @@ I. Once off local repo setup:
     Resolving deltas: 100% (65136/65136), done.
     From github.com:fedora-openstack/nova
     * [new branch]      f16-patches -> fedora-openstack/f16-patches
-    * [new branch]      master     -> fedora-openstack/master
+    * [new branch]      master-patches -> fedora-openstack/master-patches
     From github.com:fedora-openstack/nova
     * [new tag]         2011.3     -> 2011.3
     * [new tag]         2011.3.1   -> 2011.3.1
-  git branch master-patches fedora-openstack/master
-    Branch master-patches set up to track remote branch master from fedora-openstack.
+  git branch master-patches fedora-openstack/master-patches
+    Branch master-patches set up to track remote branch master-patches from fedora-openstack.
   git remote add -f openstack git://github.com/openstack/nova.git
     Updating openstack
     remote: Counting objects: 15159, done.
@@ -44,7 +44,7 @@ I. Once off local repo setup:
 
 II. Patch set update process
 
-Here showing how I updated fedora-openstack/master branch to essex-3 + ...
+Here showing how I updated fedora-openstack/master-patches branch to essex-3 + ...
 
 1. Ensure up to date
 
@@ -77,7 +77,7 @@ git checkout master
      1 files changed, 0 insertions(+), 25 deletions(-)
      delete mode 100644 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
     Switched to branch 'master-patches'
-    Your branch and 'fedora-openstack/master' have diverged,
+    Your branch and 'fedora-openstack/master-patches' have diverged,
     and have 1747 and 281 different commit(s) each, respectively.
     Switched to branch 'master'
     Your branch is ahead of 'origin/master' by 1 commit.
@@ -99,7 +99,7 @@ git push
 6. Push updated master-patches back to github
 (note the '+' below to allow non fast-forward updates)
 
-git push fedora-openstack +master-patches:master
+git push fedora-openstack +master-patches
 
 The same process applies for fedora-openstack/f16-patches.
 Note el6 patches are not yet maintained in git, so