[svn-r22274] merge from trunk, resolve conflicts

1 files changed, 40 insertions, 2 deletions

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index f0f296c..8761fb9 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.112 currently under development
+HDF5 version 1.9.114 currently under development
 ================================================================================
 
 
@@ -93,6 +93,11 @@ New Features
 
     Library:
     --------
+    - The data sieve buffer size was for all the datasets in the file.  It
+      could waste memory if any dataset size is smaller than the sieve buffer
+      size.  Now the library picks the smaller one between the dataset size
+      and the sieve buffer size from the file access property. See Issue 7934.
+      (SLU - 2012/4/2)
     - I added a new parameter of object access property list to the function 
       H5Rdereference (Issue 2763).  It's called H5Rdereference2 now.  The former
       H5Rdereference function has been deprecated to H5Rdereference1. (SLU -
@@ -172,6 +177,11 @@ New Features
 
     Fortran Library:
     ----------------
+
+    - Added for the C API the Fortran wrapper:
+       h5ocopy_f (MSB - 2012/03/22)
+
+
     HDF5 Fortran library was enhanced to support Fortran 2003 standard.
     The following features are available when the HDF5 library is configured
     using --enable-fortran --enable-fortran2003 configure flags AND
@@ -352,7 +362,7 @@ New Features
 
      - New API: h5ltpath_valid (Fortran: h5ltpath_valid_f) which checks
        if a path is correct and determines if a link resolves to a valid
-       object and does not dangle. (MSB- 2012/3/15)
+       object and checks that the link does not dangle. (MSB- 2012/3/15)
     
     Documentation 
     ------------- 
@@ -368,6 +378,16 @@ Bug Fixes since HDF5-1.8.0 release
 
     Library
     -------
+      - Fixed an error that would occur when copying an object with attribute
+            creation order tracked and indexed. (NAF - 2012/3/28 - HDFFV-7762)
+      - Fixed a bug in H5Ocopy(): When copying an opened object, call the
+	    object's flush class action to ensure that cached data is flushed
+            so that H5Ocopy will get the correct data.  
+	    (VC - 2012/3/27 - HDFFV-7853)
+      - When an application tries to write or read many small data chunks and
+            runs out of memory, the library had a seg fault.  The fix is to 
+            return the error stack with proper information. (SLU - 2012/3/23.
+            Issue 7785) 
       - H5Pset_data_transform had seg fault in some cases like x*-100.  It
             works correctly now and handles other cases like 100-x or 2/x.
             (SLU - 2012/3/15.  Issue 7922) 
@@ -379,6 +399,10 @@ Bug Fixes since HDF5-1.8.0 release
             2012/1/25. Issue 7756)
       - Fixed a seg fault that could occur when shrinking a dataset with chunks
             larger than 1 MB. (NAF - 2011/11/30 - HDFFV-7833)
+      - Fixed a bug that could cause file corruption when copying named
+            datatypes to a file using shared messages. (NAF - 2011/11/14)
+      - Fixed a bug that could cause H5Oget_info to return the wrong address
+            after copying a named datatype. (NAF - 2011/11/14)
       - The library allowed the conversion of strings between ASCII and UTF8
             (Issue 7582).  We have corrected it to report an error under this
             situation. (SLU - 2011/11/8)
@@ -593,6 +617,12 @@ Bug Fixes since HDF5-1.8.0 release
 
     Configuration
     -------------
+    - Fixed Makefile issue in which "-Wl," was not properly specified
+      prior to -rpath when building parallel fortran libraries with
+      an Intel compiler. (MAM - 2012/03/26)
+    - Makefiles generated by other packages using h5cc as the compiler
+      no longer error when 'make' is invoked more than once in order
+      to 'rebuild' after changes to source. (MAM - 2012/03/26)
     - Added --enable-fortran2003 flag to enable Fortran2003 support
       in the HDF5 Fortran library. The flag should be used along with the
       --enable-fortran flag and takes affect only when Fortran compiler
@@ -666,6 +696,10 @@ Bug Fixes since HDF5-1.8.0 release
 
     Tools
     -----
+        - h5diff: Fixed failure for comparing same named object with different
+          object types in comparing groups. Prior to the fix, h5diff resulted
+          in error. After the fix, h5diff detects such case as non-comparable
+          and display messages accordingly. HDFFV-7664 (JKM 2012/03/28)
         - h5diff: If unique objects exists only in one file and try to exclude
           the unique objects with --exclude-path option, h5diff missed 
           excluding some objects. 
@@ -878,6 +912,10 @@ Bug Fixes since HDF5-1.8.0 release
 
     Fortran High-Level APIs:
      ------
+
+      - Lite: The h5ltget_attribute_string_f used to return the C NULL character in the 
+              returned character buffer. The returned Fortran charactor buffer now does 
+              not return the C NULL character. (MSB - 2012/3/23)
       - Lite: The h5ltget_dataset_info_f function (gets information about a dataset) 
            was not correctly returning the dimension array. (PVN - 2009/3/23)
       - Lite: the h5ltread_dataset_string_f and h5ltget_attribute_string_f functions