aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-03-17 23:30:35 +0000
committerKeir Fraser <keir@xen.org>2011-03-17 23:30:35 +0000
commitc94112e5887eabda23723d5beecd2bb4d17006a7 (patch)
treeb5fe75687f2cbf06fa07c84d59df9f9f004a5a35
parent494c9074b3dc32b7b3b7f84e6aca2781f9bdc096 (diff)
downloadxen-c94112e5887eabda23723d5beecd2bb4d17006a7.tar.gz
xen-c94112e5887eabda23723d5beecd2bb4d17006a7.tar.bz2
xen-c94112e5887eabda23723d5beecd2bb4d17006a7.zip
Update Xen version to 4.2-unstable
-rw-r--r--README12
-rw-r--r--xen/Makefile4
2 files changed, 8 insertions, 8 deletions
diff --git a/README b/README
index 8e1c1e9a4f..ff154b2e78 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
#################################
- __ __ _ _ _
- \ \/ /___ _ __ | || | / |
- \ // _ \ '_ \ | || |_ | |
- / \ __/ | | | |__ _|| |
- /_/\_\___|_| |_| |_|(_)_|
+ __ __ _ _ ____
+ \ \/ /___ _ __ | || | |___ \
+ \ // _ \ '_ \ | || |_ __) |
+ / \ __/ | | | |__ _| / __/
+ /_/\_\___|_| |_| |_|(_)_____|
#################################
@@ -19,7 +19,7 @@ is freely-distributable Open Source software, released under the GNU
GPL. Since its initial public release, Xen has grown a large
development community, spearheaded by xen.org (http://www.xen.org).
-The 4.1 release offers excellent performance, hardware support and
+The 4.2 release offers excellent performance, hardware support and
enterprise-grade features such as x86_32-PAE, x86_64, SMP guests and
live relocation of VMs. Ports to Linux, NetBSD, FreeBSD and Solaris
are available from the community.
diff --git a/xen/Makefile b/xen/Makefile
index a6367df7d4..dcaab5cbf2 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -1,8 +1,8 @@
# This is the correct place to edit the build version.
# All other places this is stored (eg. compile.h) should be autogenerated.
export XEN_VERSION = 4
-export XEN_SUBVERSION = 1
-export XEN_EXTRAVERSION ?= .0-rc7-pre$(XEN_VENDORVERSION)
+export XEN_SUBVERSION = 2
+export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
-include xen-version