summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Manual sync with develop (#95)Dana Robinson2020-11-17175-1691/+7656
| | | | Brings all features from develop. Note that RELEASE.txt has not been updated (will be done in a future PR).
* Merge pull request #89 from byrnHDF/hdf5_1_12Larry Knox2020-11-1420-10/+4525
|\ | | | | Hdf5 1 12 doxygen support framework
| * Add doxygen macro file to listAllen Byrne2020-11-131-0/+1
| |
| * Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into hdf5_1_12Allen Byrne2020-11-130-0/+0
| |\
| * | Add doxygen framework for CMake and autotoolsAllen Byrne2020-11-1319-10/+4524
| | |
* | | Merge pull request #93 from lrknox/hdf5_1_12Larry Knox2020-11-131-1/+1
|\ \ \ | | | | | | | | Merge pull request #91 from ksunden/patch-1
| * | | Merge pull request #91 from ksunden/patch-1Larry Knox2020-11-131-1/+1
| | |/ | |/| | | | Fix spelling of metadata
* | | Merge pull request #88 from derobins/12/hdfs_vfd_stubsLarry Knox2020-11-132-21/+79
|\ \ \ | |/ / |/| | Brings HDFS VFD binary compatibility stubs from 1.10
| * | Brings HDFS VFD binary compatibility stubs from 1.10Dana Robinson2020-11-132-21/+79
|/ / | | | | | | | | | | | | | | | | | | | | The implementation of the HDFS VFD included no-op stubs for HDFS functionality, even when the HDFS VFD was not being built. These were removed in the develop branch and those changes were merged to the 1.12 development trunk after 1.12.0 was released. This would lead to binary compatibility problems if released in HDF5 1.12.1. This commit restores the no-op stubs.
* | Merge pull request #85 from byrnHDF/hdf5_1_12Larry Knox2020-11-1223-95/+68
|\ \ | |/ | | Correct TARGET variable and CMake config file location
| * Correct TARGET variable and CMake config file locationAllen Byrne2020-11-1223-95/+68
|/
* Merge pull request #63 from byrnHDF/hdf5_1_12Larry Knox2020-10-3050-322/+4790
|\ | | | | HDFFV-10868 merge from develop
| * HDFFV-10868 Corrections from reviewAllen Byrne2020-10-291-21/+21
| |
| * HDFFV-10868 merge from developAllen Byrne2020-10-2850-322/+4790
| |
* | Merge pull request #57 from byrnHDF/hdf5_1_12Larry Knox2020-10-243-14/+14
|\ \ | |/ | | OESS-98 - add option to build plugin library with hdf5
| * OESS-98 - add option to build plugin library with hdf5Allen Byrne2020-10-233-14/+14
|/
* Merge pull request #50 from byrnHDF/hdf5_1_12Larry Knox2020-10-203-3/+5
|\ | | | | URL and options corrections
| * URL and options correctionsAllen Byrne2020-10-193-3/+5
| |
* | Merge pull request #43 from byrnHDF/hdf5_1_12Larry Knox2020-10-1964-189/+685
|\ \ | |/ | | HDF5 1 12 merge of plugins option
| * Mostly whitespace - reorder of inits.Allen Byrne2020-10-194-16/+17
| |
| * OESS-98 add CMake option to build plugins project within hdf5Allen Byrne2020-10-1660-173/+668
| |
| * Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into hdf5_1_12Allen Byrne2020-10-120-0/+0
| |\ | |/ |/|
* | Enable splitter test (#33)Allen Byrne2020-10-111-1/+1
| |
| * Enable splitter testAllen Byrne2020-10-111-1/+1
|/
* Merge pull request #32 from lrknox/hdf5_1_12Larry Knox2020-10-102-2/+2
|\ | | | | Hdf5 1 12
| * Remove 1 addition to src/H5Cmpio.c of member added to H5C_t struct in ↵Larry Knox2020-10-101-1/+1
| | | | | | | | | | | | develop branch inadvertently and partially merged to hdf5_1_12 branch. The addition breaks compile with parallel enabled; removing it restores compile, tested with MPICH 3.3 and OpenMPI 4.0.0. e with '#' will be ignored, and an empty message aborts the commit.
| * Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5 into hdf5_1_12Larry Knox2020-10-10279-16579/+16364
| |\ | |/ |/|
* | Merge pull request #30 from byrnHDF/hdf5_1_12Larry Knox2020-10-09195-12362/+12270
|\ \ | | | | | | Hdf5 1 12 merge changes from develop
| * | Remove line referencing new cache feature not yet movedAllen Byrne2020-10-081-1/+0
| | |
| * | Merge changes from developAllen Byrne2020-10-08195-12362/+12271
|/ / | | | | | | | | Comments and whitespace Skip file-locking and cache changes
* | Merge pull request #28 from byrnHDF/hdf5_1_12Larry Knox2020-10-0897-4229/+4105
|\ \ | | | | | | Hdf5 1 12
| * | Merge from developAllen Byrne2020-10-0721-3816/+3735
| | | | | | | | | | | | | | | | | | github workflow files parser files bin scripts doc corrections
| * | Cleanup comments in tests, align comments better, update vfd testAllen Byrne2020-10-0568-393/+350
| | |
| * | HDFFV-11096 fix usage ext in h5dumpAllen Byrne2020-10-0510-23/+23
|/ /
| * Fix memory leak in H5PL__find_plugin_in_pathMichael Kuhn2020-10-051-1/+3
| | | | | | | | | | When encountering a directory, the current loop iteration was skipped without freeing the memory allocated for the path.
| * Correct entries related to --enable-build-mode and --enable-profiling inLarry Knox2020-10-032-10/+7
|/ | | | INSTALL file, and remove obsolete SZIP paragraph from COPYING file.
* Merge pull request #2914 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to ↵Allen Byrne2020-10-012-2/+9
|\ | | | | | | | | | | | | hdf5_1_12 * commit 'e2f38a4a9756211de00f12963adaa7dd25fa397c': Add action options
| * Add action optionsAllen Byrne2020-10-012-2/+9
|/
* Merge pull request #2909 in HDFFV/hdf5 from ↵Allen Byrne2020-10-011118-319767/+321901
|\ | | | | | | | | | | | | ~BYRN/hdf5_clang_format:hdf5_1_12 to hdf5_1_12 * commit 'f1ba03cea5b82699a984c80bd2deac14fdc8df18': Source formatted
| * Source formattedAllen Byrne2020-10-011118-319767/+321901
|/
* Merge pull request #2903 in HDFFV/hdf5 from ↵Allen Byrne2020-09-30116-8233/+9706
|\ | | | | | | | | | | | | | | | | | | ~BYRN/hdf5_clang_format:hdf5_1_12 to hdf5_1_12 * commit '3088c6abec27ad477031a71d947ac3be4cb2429d': define name warning format fixes and define name from develop Src file format preventive updates Add clang-format changes from develop.
| * define nameAllen Byrne2020-09-301-1/+1
| |
| * warning format fixes and define name from developAllen Byrne2020-09-307-17/+10
| |
| * Src file format preventive updatesAllen Byrne2020-09-287-281/+293
| |
| * Add clang-format changes from develop.Allen Byrne2020-09-28106-8088/+9556
|/
* Merge pull request #2899 in HDFFV/hdf5 from ~JHENDERSON/hdf52:hdf5_1_12 to ↵Jordan Henderson2020-09-251-1/+1
|\ | | | | | | | | | | | | hdf5_1_12 * commit '6329ff98ce57d87fd1a7d233cb87076dc2fff99d': Fix memory sanity check option in CMake
| * Fix memory sanity check option in CMakeJordan Henderson2020-09-241-1/+1
|/
* Merge pull request #2892 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_12 to ↵Larry Knox2020-09-186-7/+7
|\ | | | | | | | | | | | | hdf5_1_12 * commit '0cbb20b68e83a52d798676a81a3bbca284b1b36b': Snapshot version 1.12 release 1-2. Update version to 1.12.1-3
| * Snapshot version 1.12 release 1-2. Update version to 1.12.1-3Larry Knox2020-09-186-7/+7
|/
* Merge pull request #2875 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_12 to ↵Larry Knox2020-09-042-1/+13
|\ | | | | | | | | | | | | | | hdf5_1_12 * commit 'f838fcbe6709c4a6780fe4874709d42d1d6e3bb9': Add zlib and szip pages Correct COPYING path