[Xen-changelog] [xen master] Update version to Xen 4.6 RC

[patchbot@xxxxxxx]

commit 88517788ea839c367da14b514ab3d1f25994c514
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Tue Aug 11 14:51:43 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Aug 11 15:39:16 2015 +0100

    Update version to Xen 4.6 RC
    
    * Change README to say `Xen 4.6-rc'
    * Change XEN_EXTRAVERSION so that we are `4.6.0-rc'
    
    Note that the RC number (eg, 1 for rc1) is not in the version string,
    so that we do not need to update this again when we cut the next RC.
    
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    CC: Jan Beulich <jbeulich@xxxxxxxx>
    CC: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 README       |   12 ++++++------
 xen/Makefile |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 0e456b8..522f1a2 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 #################################
-__  __            _  _    __                         _        _     _      
-\ \/ /___ _ __   | || |  / /_        _   _ _ __  ___| |_ __ _| |__ | | ___ 
- \  // _ \ '_ \  | || |_| '_ \ _____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
- /  \  __/ | | | |__   _| (_) |_____| |_| | | | \__ \ || (_| | |_) | |  __/
-/_/\_\___|_| |_|    |_|(_)___/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
-                                                                           
+__  __            _  _    __
+\ \/ /___ _ __   | || |  / /_        _ __ ___
+ \  // _ \ '_ \  | || |_| '_ \ _____| '__/ __|
+ /  \  __/ | | | |__   _| (_) |_____| | | (__
+/_/\_\___|_| |_|    |_|(_)___/      |_|  \___|
+
 #################################
 
 http://www.xen.org/
diff --git a/xen/Makefile b/xen/Makefile
index 6305880..6088c9d 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 6
-export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog