summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1447 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2019-01-0722-125/+476
|\
| * HDFFV-10674, 10664, 10674Allen Byrne2019-01-0722-125/+476
* | Merge pull request #1446 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to h...Dana Robinson2019-01-077-7/+85
|\ \ | |/ |/|
| * Merged the rest of the parallel flush test code.Dana Robinson2019-01-077-7/+85
|/
* Merge pull request #1437 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to h...Dana Robinson2019-01-063-245/+273
|\
| * Cherry pick of CMake parallel flush fixes.Dana Robinson2019-01-053-245/+273
|/
* Merge pull request #1431 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10...Binh-Minh Ribler2019-01-053-11/+50
|\
| * Revised textBinh-Minh Ribler2019-01-041-3/+4
| * Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5...Binh-Minh Ribler2019-01-04215-7083/+8870
| |\
| * | Fixed CVE division-by-zero issuesBinh-Minh Ribler2019-01-043-11/+49
* | | Merge pull request #1432 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:dset_ohdr_minimi...jake.smith2019-01-051-0/+25
|\ \ \ | |_|/ |/| |
| * | Tweak minimized datset header release info.Jacob Smith2019-01-041-6/+20
| * | Add dataset header minimization release info.Jacob Smith2019-01-041-0/+11
* | | Merge pull request #1419 in HDFFV/hdf5 from ~JAKE.SMITH/hdf5:dset_ohdr_minimi...jake.smith2019-01-0422-1475/+3188
|\ \ \ | |/ /
| * | Remove "bad" statements from end of TEST_ERROR.Jacob Smith2019-01-041-18/+18
| * | Add semicolon at end of TEST_ERROR() invocation for consistency.Jacob Smith2019-01-041-1/+1
| * | Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hd...Jacob Smith2019-01-0410-201/+1386
| |\ \ | |/ / |/| |
* | | Merge pull request #1380 in HDFFV/hdf5 from ~BMRIBLER/hdf5_1_10_bmr:hdf5_1_10...Binh-Minh Ribler2019-01-027-197/+1384
|\ \ \ | | |/ | |/|
| * | Revised per review.Binh-Minh Ribler2018-12-262-12/+22
| * | Addressed HDFFV-10661Binh-Minh Ribler2018-12-157-197/+1374
* | | Merge pull request #1424 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2019-01-021-2/+0
|\ \ \
| * | | Remove files that do not exist in branchAllen Byrne2019-01-021-2/+0
|/ / /
* | | Merge pull request #1418 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Larry Knox2018-12-312-2/+2
|\ \ \
| * | | Actual stack count updatedAllen Byrne2018-12-312-2/+2
|/ / /
| | * Change FAIL_PUTS_ERROR to TEST_ERROR.Jacob Smith2019-01-042-25/+17
| | * Change H5Dcreate() to H5Dcreate2().Jacob Smith2019-01-032-20/+20
| | * Change H5Acreate to H5Acreate2Jacob Smith2019-01-021-1/+1
| | * Remove unnecessary sJacob Smith2019-01-022-6/+0
| | * Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hd...Jacob Smith2018-12-3177-4727/+4142
| | |\ | |_|/ |/| |
* | | Merge pull request #1417 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2018-12-313-7/+10
|\ \ \
| * | | HDFFV-10669 merge from developAllen Byrne2018-12-313-7/+10
|/ / /
* | | Merge pull request #1415 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to h...Dana Robinson2018-12-3174-4720/+4132
|\ \ \
| * | | Merge of logging framework updates.Dana Robinson2018-12-3126-2509/+3640
| * | | Updated the H5I debug function so it's more robust and alwaysDana Robinson2018-12-312-35/+35
| * | | Removed 'VOL' from some H5PL comments.Dana Robinson2018-12-312-5/+4
| * | | Removed 'VOL' versions of FUNC_ENTER macros as well as empty functionsDana Robinson2018-12-3143-2156/+418
| * | | Replaced all MPI-1 calls with MPI-2 equivalents (from develop).Dana Robinson2018-12-314-15/+35
|/ / /
| | * Incoporate minimized dataset headers code and tests.Jacob Smith2018-12-3122-1474/+3201
| |/ |/|
* | Merge pull request #1404 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2018-12-2111-194/+284
|\ \
| * | Merge CMake changes from developAllen Byrne2018-12-2011-194/+284
|/ /
* | Merge pull request #1376 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2018-12-16117-690/+1261
|\ \ | |/ |/|
| * Add H5I_INVALID_HIDAllen Byrne2018-12-151-1/+1
| * Manifest fixAllen Byrne2018-12-141-0/+2
| * Tools cleanupAllen Byrne2018-12-1310-122/+80
| * HDFFV-10660,-10594 merge from developAllen Byrne2018-12-1314-13/+248
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2018-12-130-0/+0
| |\ | |/ |/|
* | Merge pull request #1373 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2018-12-136-281/+1450
|\ \
| | * HDFFV-10632 separate stderr and stdout in testsAllen Byrne2018-12-13103-565/+941
| |/
| * HDFVIEW-4 add H5A read/write functions to match H5DAllen Byrne2018-12-136-281/+1450
|/
* Merge pull request #1359 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdf5_1_10 to h...Dana Robinson2018-12-0719-352/+148
|\