release - Branch for 2.6, adjust sys/sys/param.h and sys/conf/newvers.sh v2.6.0
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 28 Mar 2010 22:56:27 +0000 (15:56 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 28 Mar 2010 22:56:27 +0000 (15:56 -0700)
sys/conf/newvers.sh
sys/sys/param.h

index 4110ede..ed75464 100644 (file)
@@ -44,7 +44,7 @@ fi
 
 # Set the branch
 #
-BRANCH="DEVELOPMENT_2_5"
+BRANCH="RELEASE_2_6"
 
 TYPE="DragonFly"
 
index bad9045..5eb5a74 100644 (file)
  * 200206 - *sleep() renames
  * 200400 - 2.4 branch
  * 200500 - 2.5 master
+ * 200600 - 2.6 branch
+ * 200700 - 2.7 master
  */
 #undef __DragonFly_version
-#define __DragonFly_version 200500     /* Master, propagated to newvers */
+#define __DragonFly_version 200600     /* propagated to newvers */
 
 #ifdef __FreeBSD__
 /*