Initial Beta1 updates for Release 4.2

baigubulu · Feb 27, 2017 · 2c7ea1d · 2c7ea1d
1 parent 2fa046a
commit 2c7ea1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 dnl $Id$
 
 AC_PREREQ([2.69])
-AC_INIT([tcpreplay],[4.1.2],[https://github.com/appneta/tcpreplay/issues],[tcpreplay],[http://tcpreplay.sourceforge.net/])
+AC_INIT([tcpreplay],[4.2.0],[https://github.com/appneta/tcpreplay/issues],[tcpreplay],[http://tcpreplay.sourceforge.net/])
 AC_CONFIG_SRCDIR([src/tcpreplay.c])
 AM_CONFIG_HEADER([src/config.h])
 AC_CONFIG_AUX_DIR(config)
@@ -17,8 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
 
 dnl Set version info here!
 MAJOR_VERSION=4
-MINOR_VERSION=1
-MICRO_VERSION=2
+MINOR_VERSION=2
+MICRO_VERSION=0-beta1
 TCPREPLAY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 PACKAGE_URL=http://tcpreplay.appneta.com/
 

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,5 +1,7 @@
 02/26/2017 Version 4.2.0beta1
-    - Include Travis-CI build support (#264) (#285)
+    - Update git-clone instructions by Kyle McDonald (#277) 
+    - Add protection against packet drift by Guillaume Scott (#268)
+    - Include Travis-CI build support by Ilya Shipitsin (#264) (#285)
 
 11/19/2016 Version 4.1.2
     - Fix compilation with musl C library (#260)