summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor change to header comments in file locking C++ changes.Dana Robinson2020-08-031-2/+2
* Squash merge of file locking fixesDana Robinson2020-08-0339-309/+1458
* Merge pull request #2723 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-08-019-414/+331
|\
| * Minor normalizations with hdf5_1_10Dana Robinson2020-07-319-414/+331
* | Merge pull request #2722 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-312-5/+8
|\ \ | |/ |/|
| * Mingw copy disabledAllen Byrne2020-07-312-5/+8
|/
* Merge pull request #2720 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-07-3111-312/+220
|\
| * Merge branch 'develop' into develop_minorDana Robinson2020-07-3071-4714/+4091
| |\ | |/ |/|
* | Merge pull request #2718 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-3010-134/+126
|\ \
| * | Warnings reduction in toolsAllen Byrne2020-07-3010-134/+126
|/ /
* | Merge pull request #2716 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-299-27/+27
|\ \
| * | Correct reference fileAllen Byrne2020-07-291-2/+2
| * | Correct h5diff filenamesAllen Byrne2020-07-299-29/+29
|/ /
* | Merge pull request #2711 in HDFFV/hdf5 from bmr-HDFFV-11120 to developBinh-Minh Ribler2020-07-292-1/+29
|\ \
| * | Fixed typos in error messages.Binh-Minh Ribler2020-07-281-3/+3
| * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ...Binh-Minh Ribler2020-07-2223-236/+162
| |\ \
| * | | Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)Binh-Minh Ribler2020-07-222-1/+29
* | | | Merge pull request #2714 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_set_extent...Dana Robinson2020-07-284-5/+99
|\ \ \ \
| * | | | Updated the Java tests to deal with H5Sset_extent_none changesDana Robinson2020-07-281-1/+1
| * | | | Fixed additional typos in tselect.c comments.Dana Robinson2020-07-281-2/+2
| * | | | Fixes typo in tselect.cDana Robinson2020-07-281-1/+1
| * | | | Updates H5Sset_extent_none() to set H5S_NULLDana Robinson2020-07-283-4/+98
| | |/ / | |/| |
* | | | Merge pull request #2697 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-2864-4679/+3942
|\ \ \ \ | |/ / / |/| | |
| * | | Only one line needed to compareAllen Byrne2020-07-271-0/+1
| * | | Revert err fileAllen Byrne2020-07-271-8/+0
| * | | revert error-stack enableAllen Byrne2020-07-201-1/+1
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-2023-236/+162
| |\ \ \ | |/ / / |/| | |
| * | | Add release notes for toolsAllen Byrne2020-07-201-2/+38
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-178-1/+200
| |\ \ \ | | |/ /
| * | | add test file extAllen Byrne2020-07-172-4/+4
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-174-31/+30
| |\ \ \
| * \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-164-25/+336
| |\ \ \ \
| * | | | | Correct file name in testAllen Byrne2020-07-161-1/+1
| * | | | | Tools refactorAllen Byrne2020-07-1560-4667/+3901
| * | | | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-142-29/+8
| |\ \ \ \ \
| * \ \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-117-5/+94
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-0921-1074/+1055
| |\ \ \ \ \ \ \
| | | | | | | | * Minor normalization with 1.10 branchDana Robinson2020-07-2711-312/+220
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #2703 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-07-2023-236/+162
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Minor normalization with 1.10.Dana Robinson2020-07-2023-236/+162
* | | | | | | | Merge pull request #2693 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV...Vailin Choi2020-07-178-1/+200
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Update MANIFEST.vchoi2020-07-162-0/+2
| * | | | | | | Fix for jira issue HDFFV-11080:vchoi2020-07-146-1/+198
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #2700 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-07-174-31/+30
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Minor normalization with 1.10Dana Robinson2020-07-174-31/+30
|/ / / / /
* | | | | Merge pull request #2694 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:fix_vlen_ref to d...Jerome Soumagne2020-07-164-25/+336
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | H5R: fix type conversion of references within vlen typeJerome Soumagne2020-07-164-25/+336
|/ / / /
* | | | Merge pull request #2692 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-07-142-29/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Removed POSIX #defines from configure on Solaris.Dana Robinson2020-07-141-6/+0
| * | | Fallback to older time functions in new timer code.Dana Robinson2020-07-141-23/+8
|/ / /