Preparing for release 3.1.2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/branches/branch-3.1@883531 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,4 +1,4 @@
-Release 3.1.2 - 2009-11-24
+Release 3.1.2 - 2009-11-27
 
 Backward compatibile changes:
 

build.xml

@@ -24,7 +24,7 @@
 
     <property environment="env"/>
     
-    <property name="version" value="3.1.1" />
+    <property name="version" value="3.1.2" />
     <property name="final.name" value="${name}-${version}"/>
     <property name="revision.dir" value="${basedir}/.revision" />
     <property name="revision.properties" value="revision.properties" />

docs/releasenotes.html

@@ -5,7 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.8">
 <meta name="Forrest-skin-name" content="pelt">
-<title>ZooKeeper 3.1.1 Release Notes</title>
+<title>ZooKeeper 3.1.2 Release Notes</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -184,11 +184,11 @@ document.write("Last Published: " + document.lastModified);
 <a class="dida" href="releasenotes.pdf"><img alt="PDF -icon" src="skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
 </div>
-<h1>ZooKeeper 3.1.1 Release Notes</h1>
+<h1>ZooKeeper 3.1.2 Release Notes</h1>
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
-<a href="#changes">Changes Since ZooKeeper 3.1.0</a>
+<a href="#changes">Changes Since ZooKeeper 3.1.1</a>
 </li>
 </ul>
 </div>
@@ -216,12 +216,12 @@ later.</p>
 
 
 <a name="N10016"></a><a name="changes"></a>
-<h2 class="h3">Changes Since ZooKeeper 3.1.0</h2>
+<h2 class="h3">Changes Since ZooKeeper 3.1.1</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
-<caption>Changes Since ZooKeeper 3.1.0</caption>
+<caption>Changes Since ZooKeeper 3.1.1</caption>
 
-<title>Changes Since ZooKeeper 3.1.0</title>
+<title>Changes Since ZooKeeper 3.1.1</title>
 
 
 <tr>
@@ -234,21 +234,6 @@ later.</p>
 
     
 
-<tr>
-  
-<td>Improvement</td>
-  <td></td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-279">ZOOKEEPER-279</a></td><td>         Allow specialization of quorum config parsing (e.g. variable expansion in zoo.cfg)
-</td>
-
-</tr>
-                                
-
 <tr>
   
 <td>Bug</td>
@@ -257,70 +242,14 @@ later.</p>
 </tr>
 
 <tr>
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-281">ZOOKEEPER-281</a></td><td>         autoreconf fails for /zookeeper-3.0.1/src/c/
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-309">ZOOKEEPER-309</a></td><td>         core dump using zoo_get_acl() 
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-313">ZOOKEEPER-313</a></td><td>         Problem with successive leader failures when no client is connected 
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-319">ZOOKEEPER-319</a></td><td>         add locking around auth info in zhandle_t
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-320">ZOOKEEPER-320</a></td><td>         call auth completion in free_completions()
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-326">ZOOKEEPER-326</a></td><td>         standalone server ignores tickTime configuration
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-330">ZOOKEEPER-330</a></td><td>         zookeeper standalone server does not startup with just a port and datadir.
+<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-582">ZOOKEEPER-582</a></td><td>ZooKeeper can revert to old data when a snapshot is created outside of normal processing
 </td>
 
 </tr>
 
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-332">ZOOKEEPER-332</a></td><td>         c client issues (memory leaks) reported by valgrind
-</td>
-
-</tr>
 
 <tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-333">ZOOKEEPER-333</a></td><td>         helgrind thread issues identified in mt c client code
-</td>
-
-</tr>
-
-<tr>
-
-<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-341">ZOOKEEPER-341</a></td><td>         regression in QuorumPeerMain, tickTime from config is lost, cannot start quorum
+<td><a href="https://issues.apache.org/jira/browse/ZOOKEEPER-562">ZOOKEEPER-562</a></td><td>c client can flood server with pings if tcp send queue filled 
 </td>
 
 </tr>

src/c/configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([zookeeper C client],3.1.1,[zookeeper-user@hadoop.apache.org],[c-client-src])
+AC_INIT([zookeeper C client],3.1.2,[zookeeper-user@hadoop.apache.org],[c-client-src])
 AC_CONFIG_SRCDIR([src/zookeeper.c])
 AC_CHECK_FILES([generated/zookeeper.jute.c generated/zookeeper.jute.h],[],
     [AC_MSG_ERROR([jute files are missing! Please run "ant compile_jute" while in the zookeeper top level directory.])

src/c/include/zookeeper_version.h

@@ -24,7 +24,7 @@ extern "C" {
 
 #define ZOO_MAJOR_VERSION 3
 #define ZOO_MINOR_VERSION 1
-#define ZOO_PATCH_VERSION 1
+#define ZOO_PATCH_VERSION 2
 
 #ifdef __cplusplus
 }

src/docs/src/documentation/content/xdocs/releasenotes.xml

@@ -18,7 +18,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
 "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
 <article id="ar_ReleaseNotes">
-  <title>ZooKeeper 3.1.1 Release Notes</title>
+  <title>ZooKeeper 3.1.2 Release Notes</title>
 
   <articleinfo>
     <legalnotice>
@@ -51,10 +51,10 @@ from version 2 of ZooKeeper (SourceForge) to version 3 or
 later.</para>
 
 <section id="changes">
-<title>Changes Since ZooKeeper 3.1.0</title>
+<title>Changes Since ZooKeeper 3.1.1</title>
 
 <table>
-<title>Changes Since ZooKeeper 3.1.0</title>
+<title>Changes Since ZooKeeper 3.1.1</title>
 <tgroup cols='2'>
 <colspec colname='c1'/><colspec colname='c2'/>
 <thead>
@@ -66,56 +66,15 @@ later.</para>
 <tbody>
 
     
-<row>
-  <entry>Improvement</entry>
-  <entry></entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-279">ZOOKEEPER-279</ulink></entry><entry>         Allow specialization of quorum config parsing (e.g. variable expansion in zoo.cfg)
-</entry>
-</row>
-                                
 <row>
   <entry>Bug</entry>
   <entry></entry>
 </row>
-<row><entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-281">ZOOKEEPER-281</ulink></entry><entry>         autoreconf fails for /zookeeper-3.0.1/src/c/
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-309">ZOOKEEPER-309</ulink></entry><entry>         core dump using zoo_get_acl() 
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-313">ZOOKEEPER-313</ulink></entry><entry>         Problem with successive leader failures when no client is connected 
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-319">ZOOKEEPER-319</ulink></entry><entry>         add locking around auth info in zhandle_t
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-320">ZOOKEEPER-320</ulink></entry><entry>         call auth completion in free_completions()
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-326">ZOOKEEPER-326</ulink></entry><entry>         standalone server ignores tickTime configuration
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-330">ZOOKEEPER-330</ulink></entry><entry>         zookeeper standalone server does not startup with just a port and datadir.
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-332">ZOOKEEPER-332</ulink></entry><entry>         c client issues (memory leaks) reported by valgrind
-</entry>
-</row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-333">ZOOKEEPER-333</ulink></entry><entry>         helgrind thread issues identified in mt c client code
+<row><entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-582">ZOOKEEPER-582</ulink></entry><entry>ZooKeeper can revert to old data when a snapshot is created outside of normal processing
 </entry>
 </row>
-<row>
-<entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-341">ZOOKEEPER-341</ulink></entry><entry>         regression in QuorumPeerMain, tickTime from config is lost, cannot start quorum
+
+<row><entry><ulink url="https://issues.apache.org/jira/browse/ZOOKEEPER-562">ZOOKEEPER-562</ulink></entry><entry>c client can flood server with pings if tcp send queue filled 
 </entry>
 </row>