# HG changeset patch
# User Katie Lucas <katie.lucas@xxxxxxxxxx>
# Date 1296728969 0
# Node ID 1a5de91b667fbd0fa2369c948bf1ad0cb161f3f5
# Parent  85947f3c84b16b5f76e70ff9ba10bb7fe6231657
CP-2105 CP-2114 CP-2127 Adding guest templates

diff -r 85947f3c84b1 -r 1a5de91b667f CP-2105.CP-2114.CP-2127.add_guest_templates.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CP-2105.CP-2114.CP-2127.add_guest_templates.patch	Thu Feb 03 10:29:29 2011 +0000
@@ -0,0 +1,26 @@
+diff -r 90944f68f915 ocaml/xapi/create_templates.ml
+--- a/ocaml/xapi/create_templates.ml	Wed Feb 02 16:52:33 2011 +0000
++++ b/ocaml/xapi/create_templates.ml	Thu Feb 03 10:26:23 2011 +0000
+@@ -483,17 +483,20 @@
+ 		rhel5x_template "CentOS 5" X64 [    ];
+ 		rhel5x_template "Oracle Enterprise Linux 5" X32 [    ];
+ 		rhel5x_template "Oracle Enterprise Linux 5" X64 [    ];
+-		rhel6x_template "Red Hat Enterprise Linux 6"   X32 ~is_experimental:true [    ];
+-		rhel6x_template "Red Hat Enterprise Linux 6"   X64 ~is_experimental:true [    ];
++		rhel6x_template "Red Hat Enterprise Linux 6"   X32 [    ];
++		rhel6x_template "Red Hat Enterprise Linux 6"   X64 [    ];
+ 
+ 		sles_9_template    "SUSE Linux Enterprise Server 9 SP4"  X32 [    ];
+ 		sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X32 [    ];
+ 		sles10_template    "SUSE Linux Enterprise Server 10 SP2" X32 [    ];
++		sles10_template    "SUSE Linux Enterprise Server 10 SP3" X32 [    ];
++		sles10_template    "SUSE Linux Enterprise Server 10 SP4beta" X32 ~is_experimental:true [    ];
+ 		sles11_template    "SUSE Linux Enterprise Server 11"     X32 [    ];
+ 		sles11_template    "SUSE Linux Enterprise Server 11 SP1" X32 [    ];
+ 		sles10sp1_template "SUSE Linux Enterprise Server 10 SP1" X64 [    ];
+ 		sles10_template    "SUSE Linux Enterprise Server 10 SP2" X64 [    ];
+ 		sles10_template    "SUSE Linux Enterprise Server 10 SP3" X64 [    ];
++		sles10_template    "SUSE Linux Enterprise Server 10 SP4beta" X64 ~is_experimental:true [    ];
+ 		sles11_template    "SUSE Linux Enterprise Server 11"     X64 [    ];
+ 		sles11_template    "SUSE Linux Enterprise Server 11 SP1" X64 [    ];
+ 
diff -r 85947f3c84b1 -r 1a5de91b667f series
--- a/series	Wed Feb 02 14:41:25 2011 +0000
+++ b/series	Thu Feb 03 10:29:29 2011 +0000
@@ -1,5 +1,6 @@
 #dummy patch to succeed build.hg qpush -a
 compiles.diff
+CP-2105.CP-2114.CP-2127.add_guest_templates.patch
 
 #SCTX-525-dechainify-vlans - MNR only