summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflictsAllen Byrne2019-04-151-1/+0
* Merge pull request #1656 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to d...Allen Byrne2019-04-154-153/+38
|\
| * Fix fortran omissionAllen Byrne2019-04-151-0/+1
| * Fix java for new H5Fget_info functionAllen Byrne2019-04-153-153/+37
* | Merge pull request #1652 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:check_passthro...Dana Robinson2019-04-159-27/+34
|\ \ | |/ |/|
| * Renamed the HDF5_TEST_VOL option to HDF5_TEST_PASSTHROUGH_VOL.Dana Robinson2019-04-115-10/+10
| * Renamed the autotools check-vol target to check-passthrough-vol.Dana Robinson2019-04-114-17/+24
* | Merge pull request #1653 in HDFFV/hdf5 from ~KOZIOL/hdf5:get_fileno to developQuincey Koziol2019-04-1418-1/+471
|\ \ | |/ |/|
| * Add C++, Java, and FORTRAN wrappers and tests for H5Fget_filenoQuincey Koziol2019-04-1413-1/+396
| * Add trace macro.Quincey Koziol2019-04-121-0/+1
| * Add H5Fget_fileno() API routine.Quincey Koziol2019-04-125-0/+74
|/
* Merge pull request #1645 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV...Vailin Choi2019-04-0829-775/+2701
|\
| * Modifications based on PR feedback:Vailin Choi2019-04-082-0/+195
| * Modification for num_elem based on PR feedback.Vailin Choi2019-04-081-1/+1
| * HDFFV-10365: Changes as described in the RFC: H5Sencode/H5Sdecode Format Change.Vailin Choi2019-04-0628-776/+2507
| * Merge pull request #2 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10...Vailin Choi2019-04-062-0/+80
| |\
| * \ Merge pull request #1 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10...Vailin Choi2019-04-066-117/+194
| |\ \
* | \ \ Merge pull request #1637 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-04-0618-185/+96
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-04-0520-170/+215
| |\ \ \ | | |/ /
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-04-052-0/+123
| |\ \ \
| * | | | Update java m4 to latestAllen Byrne2019-04-0418-185/+96
* | | | | Merge pull request #1644 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV...Vailin Choi2019-04-062-0/+80
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix for HDFFV-10271 hyperslab encoding incorrect length.Vailin Choi2019-04-052-0/+80
| | |_|/ | |/| |
* | | | Merge pull request #1642 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/separ...Vailin Choi2019-04-066-117/+194
|\ \ \ \ | |/ / / |/| | |
| * | | Move dataspace selection-specific coding to the callbacks as preparation for ...Vailin Choi2019-04-056-117/+194
| |/ /
* | | Merge pull request #1639 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/add_v...Vailin Choi2019-04-0520-170/+215
|\ \ \ | |_|/ |/| |
| * | Set V112 as the latest format and extend the arrays of version bounds.Vailin Choi2019-04-0420-170/+215
| |/
* | Merge pull request #1640 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/api_c...Vailin Choi2019-04-052-0/+123
|\ \ | |/ |/|
| * Setting API context for fapl and libver_bounnds in preparation for the H5Senc...Vailin Choi2019-04-042-0/+123
|/
* Merge pull request #1598 in HDFFV/hdf5 from env_vol_load to developQuincey Koziol2019-04-0330-468/+960
|\
| * Merge remote-tracking branch 'origin/develop' into env_vol_loadQuincey Koziol2019-04-03170-1019/+1455
| |\ | |/ |/|
* | Merge pull request #1621 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-04-0312-169/+275
|\ \
| * \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-04-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1635 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to d...Allen Byrne2019-04-033-26/+29
|\ \ \
| * | | Correct namespace handlingAllen Byrne2019-04-033-26/+29
|/ / /
| * | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-04-039-19/+19
| |\ \ | |/ / |/| |
* | | Merge pull request #1634 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to d...Allen Byrne2019-04-031-1/+1
|\ \ \
| * | | Correct entryAllen Byrne2019-04-031-1/+1
|/ / /
* | | Merge pull request #1626 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to d...Allen Byrne2019-04-024-64/+17
|\ \ \
| * | | Allow option to select NAMESPACEAllen Byrne2019-03-284-64/+17
* | | | Merge pull request #1630 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to developLarry Knox2019-04-029-19/+19
|\ \ \ \ | |/ / / |/| | |
| * | | Snapshot version 1.11 release 4.hdftest2019-04-019-19/+19
|/ / /
* | | Merge pull request #1625 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to d...Allen Byrne2019-03-284-104/+5
|\ \ \
| * | | Correct examples for packagingAllen Byrne2019-03-284-104/+5
|/ / /
| * | Add help infoAllen Byrne2019-04-031-1/+1
| * | Update for namespaceAllen Byrne2019-04-021-0/+2
| * | Add namespace option to dependenciesAllen Byrne2019-04-025-90/+44
| * | Correct examples for packagingAllen Byrne2019-03-284-104/+5
| * | HDFFV-10741 - add option to skip tool error stack testsAllen Byrne2019-03-2612-169/+275
|/ /
* | Merge pull request #1614 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to developScot Breitenfeld2019-03-264-31/+31
|\ \