From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 19 Mar 2008 21:00:44 +0000 (-0700)
Subject: - Increase version to 0.1.9.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8368c6e6e429d36c663f8d5cea054feebcc2f654;p=sliver-openvswitch.git

- Increase version to 0.1.9.
- Remove support for UML.
---

diff --git a/ChangeLog b/ChangeLog
index b8bcaa3df..e5c48f897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+v0.1.9 - 17 Mar 2008
+--------------------
+    - Added SSL/TLS support
+    - Various bug fixes and tweaks
+
 v0.1.8 - 03 Mar 2008
 --------------------
-    - Added support for cross-compilation.
+    - Added support for cross-compilation
     - Various bug fixes and tweaks
 
 v0.1.7 - 07 Feb 2008
diff --git a/configure.ac b/configure.ac
index 4ec1972ac..11cf5298e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(openflow, v0.1.8, info@openflowswitch.org)
+AC_INIT(openflow, v0.1.9, info@openflowswitch.org)
 AM_INIT_AUTOMAKE
 
 AC_PROG_CC
@@ -22,7 +22,6 @@ AC_ARG_ENABLE(
 AM_CONDITIONAL([NDEBUG], [test x$ndebug = xtrue])
 
 CHECK_LINUX(l26, 2.6, 2.6, KSRC26, L26_ENABLED)
-CHECK_LINUX(uml, 2.6, 2.6-uml, KSRCUML, UML_ENABLED)
 CHECK_LINUX(l24, 2.4, 2.4, KSRC24, L24_ENABLED)
 
 AC_CHECK_HEADER([linux/netlink.h],
@@ -49,7 +48,6 @@ secchan/Makefile
 datapath/tests/Makefile
 third-party/Makefile
 datapath/linux-2.6/Makefile
-datapath/linux-2.6-uml/Makefile
 datapath/linux-2.4/Makefile])
 
 AC_OUTPUT
diff --git a/datapath/Makefile.am b/datapath/Makefile.am
index 99c09af48..3dda217a7 100644
--- a/datapath/Makefile.am
+++ b/datapath/Makefile.am
@@ -2,14 +2,11 @@ SUBDIRS = tests
 if L26_ENABLED
 SUBDIRS += linux-2.6
 endif
-if UML_ENABLED
-SUBDIRS += linux-2.6-uml
-endif
 if L24_ENABLED
 SUBDIRS += linux-2.4
 endif
 
-EXTRA_DIST = linux-2.6 linux-2.4 linux-2.6-uml\
+EXTRA_DIST = linux-2.6 linux-2.4\
 			datapath.c snap.h chain.c  crc32.c  crc_t.c\
 			flow.h forward.h table-hash.c table-mac.c\
             unit.c unit.h datapath.h  chain.h  crc32.h\