Merge lp:~akiban-technologies/akiban-persistit/releases_notes_3.1.2_2 into lp:akiban-persistit

[Peter Beaman]

Fix a couple of typos in the release notes and a couple of Javadoc warnings in the code

LBJ: NO_BUILD

[Nathan Williams (nwilliams)]

Looks good.

review: Approve

=== modified file 'doc/ReleaseNotes.rst'
--- doc/ReleaseNotes.rst	2012-07-12 21:06:00 +0000
+++ doc/ReleaseNotes.rst	2012-07-13 13:39:21 +0000
@@ -88,7 +88,7 @@
 
 https://bugs.launchpad.net/akiban-persistit/+bug/1017957
 
-This bug preexisted but was unknown to the 3.1.1 release. An extremely rare combination of events caused memory structures caused an incorrect key-pointer pair to be inserted while deleting records in a key range. The bug was detected in an 8-hour stress test run.
+This bug preexisted but was unknown to the 3.1.1 release. An extremely rare combination of events corrupted memory structures causing an incorrect key-pointer pair to be inserted while deleting records in a key range. The bug was detected in an 8-hour stress test run.
 
 
 Slow Recovery Due to Temporary Tree IT Records
@@ -96,15 +96,13 @@
 
 https://bugs.launchpad.net/akiban-persistit/+bug/1018526
 
-This bug preexisted but was unknown to the 3.1.1 release. 
-
-Every Tree created in a temporary volume was being assigned a tree handle recorded permanently in the journal. In one case the result was a journal containing millions of IT (Identify Tree) records, and these caused normal recovery to take a very long time.  The fix keeps temporary trees out of the journal and removes IT records which may have been added previously. 
+This bug preexisted but was unknown to the 3.1.1 release. Every Tree created in a temporary volume was being assigned a tree handle recorded permanently in the journal. In one case the result was a journal containing millions of IT (Identify Tree) records, and these caused normal recovery to take a very long time.  The fix keeps temporary trees out of the journal and removes IT records which may have been added previously. 
 
 
 Asserts Added to Check for Correct Exchange Thread Behavior
 -----------------------------------------------------------
 
-A bug in the Akiban Server code caused a an Exchange to be used concurrently by two Threads, causing serious and seemingly unrelated failures in Persistit including instances of IllegalMonitorException and IllegalStateException. To guard against future occurrences, asserts were added to catch such concurrent use by multiple threads.  Applications should be tested with asserts enabled to verify correct thread usage.
+A bug in the Akiban Server code caused an Exchange to be used concurrently by two Threads, causing serious and seemingly unrelated failures in Persistit including instances of IllegalMonitorException and IllegalStateException. To guard against future occurrences, asserts were added to catch such concurrent use by multiple threads.  Applications should be tested with asserts enabled to verify correct thread usage.
  
 
 Known Issues

=== modified file 'src/main/java/com/persistit/AlertMonitor.java'
--- src/main/java/com/persistit/AlertMonitor.java	2012-06-22 19:35:13 +0000
+++ src/main/java/com/persistit/AlertMonitor.java	2012-07-13 13:39:21 +0000
@@ -537,8 +537,6 @@
      * @param category
      *            A String describing the nature of the event. A separate
      *            event-history is maintained for each unique category.
-     * @param level
-     *            Indicates whether this event is a warning or an error.
      */
     public synchronized final void post(Event event, final String category) {
         History history = _historyMap.get(category);

=== modified file 'src/main/java/com/persistit/SharedResource.java'
--- src/main/java/com/persistit/SharedResource.java	2012-06-29 20:54:00 +0000
+++ src/main/java/com/persistit/SharedResource.java	2012-07-13 13:39:21 +0000
@@ -48,7 +48,7 @@
      * Default maximum time to wait for access to this resource. Methods throw
      * an InUseException when this time is exceeded.
      */
-    final static long DEFAULT_MAX_WAIT_TIME = 60000L;
+    public final static long DEFAULT_MAX_WAIT_TIME = 60000L;
 
     /**
      * Mask for count of Threads holding a reader or writer claim (0-32767)