summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2778 in HDFFV/hdf5 from ↵Dana Robinson2020-08-1674-1004/+824
|\ | | | | | | | | | | | | ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10 * commit '0ba794be38b908271e6a2d8f5e231e4b097f25e5': Normalizations with develop
| * Normalizations with developDana Robinson2020-08-1674-1004/+824
| |
* | Merge pull request #2775 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to ↵Allen Byrne2020-08-1638-150/+2110
|\ \ | |/ |/| | | | | | | | | | | hdf5_1_10 * commit '4a6a11dd35e964b1e06055d924b0c6dd043ab1b6': Tag TRILABS-227 and fix MANIFEST HDFFV-9984 Add merge/prune h5repack options for ext links
| * Tag TRILABS-227 and fix MANIFESTAllen Byrne2020-08-152-4/+13
| |
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2020-08-15200-2308/+15806
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | * commit 'c638d93f3e660ce669a36e50a02473aac126953d': Fixes missing chunk_info entry in CMake files Even more normalization with develop More normalizations with develop Misc normalizations with develop Normalization of perform directory with develop Brings monotonic timer changes from develop Brings Mirror VFD to 1.10 from develop Brings splitter VFD from develop Brings file locking changes from develop
* | Merge pull request #2770 in HDFFV/hdf5 from ↵Dana Robinson2020-08-15200-2308/+15806
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10 * commit 'e9305abf48426f265d7ec3ae54538e3ded8889ea': Fixes missing chunk_info entry in CMake files Even more normalization with develop More normalizations with develop Misc normalizations with develop Normalization of perform directory with develop Brings monotonic timer changes from develop Brings Mirror VFD to 1.10 from develop Brings splitter VFD from develop Brings file locking changes from develop
| * | Fixes missing chunk_info entry in CMake filesDana Robinson2020-08-151-0/+1
| | |
| * | Even more normalization with developDana Robinson2020-08-1584-414/+403
| | |
| * | More normalizations with developDana Robinson2020-08-152-23/+19
| | |
| * | Misc normalizations with developDana Robinson2020-08-1529-628/+620
| | |
| * | Normalization of perform directory with developDana Robinson2020-08-159-14/+422
| | | | | | | | | | | | Brings over chunk_cache program
| * | Brings monotonic timer changes from developDana Robinson2020-08-1521-1013/+1901
| | |
| * | Brings Mirror VFD to 1.10 from developDana Robinson2020-08-1433-16/+8333
| | |
| * | Brings splitter VFD from developDana Robinson2020-08-1414-3/+2760
| | |
| * | Brings file locking changes from developDana Robinson2020-08-1438-198/+1348
| | |
| | * HDFFV-9984 Add merge/prune h5repack options for ext linksAllen Byrne2020-08-1538-149/+2100
| |/ |/|
* | Merge pull request #2766 in HDFFV/hdf5 from ↵Dana Robinson2020-08-142-15/+16
|\ \ | |/ | | | | | | | | | | ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10 * commit 'b8b219d19d158d272cd6b1037bbc8d6e3d64fc73': Cherry pick of Windows thread-safety fixes from develop
| * Cherry pick of Windows thread-safety fixes from developDana Robinson2020-08-142-15/+16
|/
* Merge pull request #2758 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to ↵Allen Byrne2020-08-132-3/+12
|\ | | | | | | | | | | | | | | hdf5_1_10 * commit '4e65a43f143f603d2b76f6f138d0d64432937548': Spelling HDFFV-11127 - force RTLD_LOCAL in dlopen
| * SpellingAllen Byrne2020-08-131-3/+3
| |
| * HDFFV-11127 - force RTLD_LOCAL in dlopenAllen Byrne2020-08-122-1/+10
|/
* Merge pull request #2750 in HDFFV/hdf5 from ↵Dana Robinson2020-08-114-3/+98
|\ | | | | | | | | | | | | ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10 * commit '98ca520f55531b0783bb1425c1fb3a125c1c40f7': Brings HDFFV-11027 H5S_NO_CLASS fix to 1.10 from develop
| * Brings HDFFV-11027 H5S_NO_CLASS fix to 1.10 from developDana Robinson2020-08-114-3/+98
|/
* Merge pull request #2731 in HDFFV/hdf5 from bmr-HDFFV-11120_110 to hdf5_1_10Binh-Minh Ribler2020-08-042-1/+29
|\ | | | | | | | | | | | | | | Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869) * commit 'a324025e00adf3dd0a9d475cfff5af2ec4c7576c': Fixed typo Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)
| * Fixed typoBinh-Minh Ribler2020-08-041-1/+1
| |
| * Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)Binh-Minh Ribler2020-08-032-1/+29
|/ | | | | | | | | | | Description: When a buffer overflow occurred because a name length was corrupted and became very large, h5dump produced a segfault on one file and a memcpy parameter overlap on another file. This commit added checks that detect a read pass the end of the buffer to prevent these error conditions. Platforms tested: Linux/64 (jelly)
* Merge pull request #2724 in HDFFV/hdf5 from ↵Dana Robinson2020-08-0124-497/+947
|\ | | | | | | | | | | | | ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10 * commit 'bfe04875838d8c3baea58c3fbfb16d9ee88d3beb': Normalization and warning fixes from develop
| * Normalization and warning fixes from developDana Robinson2020-07-3124-497/+947
| |
* | Merge pull request #2719 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to ↵Allen Byrne2020-07-3113-138/+127
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | hdf5_1_10 * commit '24369a4ff14f873a63a1e77b7069078dac284098': Remove mingw from windows copy Additional warnings removed More warnings reduction Warnings reduction in tools
| * \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2020-07-3118-453/+321
| |\ \ | |/ / |/| | | | | | | | * commit 'd17b3f53f87469fcab75baac99cdfb065186228a': Minor normalization with develop
* | | Merge pull request #2721 in HDFFV/hdf5 from ↵Dana Robinson2020-07-3118-453/+321
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ~DEROBINS/hdf5_der:1_10_normalization to hdf5_1_10 * commit 'f977c4dfd0e5eb6f6e8527bdc9e48edebe500d78': Minor normalization with develop
| * | Merge branch 'hdf5_1_10' into 1_10_normalizationDana Robinson2020-07-30101-5903/+6280
| |\ \ | |/ / |/| |
| * | Minor normalization with developDana Robinson2020-07-2718-453/+321
| | |
| | * Remove mingw from windows copyAllen Byrne2020-07-311-3/+4
| | |
| | * Additional warnings removedAllen Byrne2020-07-302-2/+0
| | |
| | * More warnings reductionAllen Byrne2020-07-305-7/+4
| | |
| | * Warnings reduction in toolsAllen Byrne2020-07-308-126/+119
| |/ |/|
* | Merge pull request #2717 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to ↵Allen Byrne2020-07-299-27/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | hdf5_1_10 * commit '5c4a6949c403afcaae484588a93063d37175e1a8': Correct reference file Correct h5diff test file names
| * | Correct reference fileAllen Byrne2020-07-291-2/+2
| | |
| * | Correct h5diff test file namesAllen Byrne2020-07-299-29/+29
|/ /
* | Merge pull request #2709 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to ↵Allen Byrne2020-07-2987-5874/+6054
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | hdf5_1_10 * commit '7ff2d27e5b268dd3576ce4fc87be69ae06118058': Add missing VFD open loop Merge changes from dev Merge from dev of tools changes
| * \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2020-07-297-1/+198
| |\ \ | |/ / |/| | | | | | | | | | | * commit '475120abfb493098e907fe40073260f48b35d15d': Supply the appropriate file pointer to H5T_patch_vlen_file() without H5F_VOL_OBJ from develop branch. Merge pull request #2693 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-11080-heap-use-after-free-by-the-call to develop
* | | Merge pull request #2707 in HDFFV/hdf5 from ↵Vailin Choi2020-07-297-1/+198
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~VCHOI/my_third_fork:bugfix/110_HDFFV-11080-heap-use-after-free-by-the-call to hdf5_1_10 * commit 'bdc6edfc5ce07363faf79519389ef149a4094530': Supply the appropriate file pointer to H5T_patch_vlen_file() without H5F_VOL_OBJ from develop branch. Merge pull request #2693 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-11080-heap-use-after-free-by-the-call to develop
| * | | Supply the appropriate file pointer to H5T_patch_vlen_file() without ↵vchoi2020-07-211-1/+1
| | | | | | | | | | | | | | | | H5F_VOL_OBJ from develop branch.
| * | | Merge pull request #2693 in HDFFV/hdf5 from ↵Vailin Choi2020-07-217-1/+198
|/ / / | | | | | | | | | | | | | | | | | | | | | ~VCHOI/my_third_fork:bugfix/HDFFV-11080-heap-use-after-free-by-the-call to develop * commit '3023b34272cc6ada84aebfa7441a6a55afa3621c': Update MANIFEST. Add new test to Cmake. Fix for jira issue HDFFV-11080: (1) Patch up the file pointer when reading attribute of variable length datatype (2) Test to verify the fix when doing multiple threads
| * | Add missing VFD open loopAllen Byrne2020-07-281-0/+29
| | |
| * | Merge changes from devAllen Byrne2020-07-282-8/+0
| | |
| * | Merge from dev of tools changesAllen Byrne2020-07-2286-5871/+6030
|/ /
* | Merge pull request #2705 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to ↵Allen Byrne2020-07-217-14/+14
|\ \ | | | | | | | | | | | | | | | | | | hdf5_1_10 * commit '892ccb28fbf37b196dfea9043b09b1dae8e8d501': Examples DESTDIR and github action
| * | Examples DESTDIR and github actionAllen Byrne2020-07-217-14/+14
|/ /