summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* CMake updates:Allen Byrne2020-07-1511-11/+137
* Merge pull request #2690 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf...Larry Knox2020-07-141-1/+4
|\
| * Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-07-131-1/+4
|/
* Merge pull request #2685 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_1_10 to hd...Dana Robinson2020-07-1015-770/+795
|\
| * Moved over the H5S_hyper_diminfo_t from develop.Dana Robinson2020-07-103-114/+124
| * Moved hyperslab code to use the new H5S_diminfo_valid_t enum.Dana Robinson2020-07-103-33/+50
| * H5S_hyper_adjust_s() optimization from develop.Dana Robinson2020-07-092-24/+35
| * Fixed Duff's device fall through warnings in hyperslab code.Dana Robinson2020-07-091-9/+16
| * H5F and H5FS normalization with develop.Dana Robinson2020-07-0910-580/+563
| * Minor renaming in H5S hyperslab code.Dana Robinson2020-07-092-15/+12
* | Merge pull request #2682 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_1_10 to hd...Dana Robinson2020-07-0933-1245/+1340
|\ \ | |/
| * Misc normalizations with develop.Dana Robinson2020-07-0914-540/+530
| * Added missing types to bin/trace after develop normalization.Dana Robinson2020-07-091-0/+2
| * More normalization with H5S from develop.Dana Robinson2020-07-093-121/+109
| * Continued normalization of H5S with develop.Dana Robinson2020-07-0911-144/+136
| * Normalization of H5MM and H5FL with develop. Adds the newDana Robinson2020-07-087-220/+445
| * Further normalization of H5S with developDana Robinson2020-07-089-220/+118
* | Merge pull request #2681 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_1_10 to hd...Dana Robinson2020-07-0819-1864/+2302
|\ \ | |/
| * Normalization of H5S package with developDana Robinson2020-07-0819-1864/+2302
* | Merge pull request #2679 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf...Larry Knox2020-07-073-10/+21
|\ \ | |/ |/|
| * Change load path in libhdf5_java.dylib to unversioned libhdf5.dylib for junit...Larry Knox2020-07-071-1/+1
| * Merge pull request #2667 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-07-061-6/+2
| * Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-07-063-4/+19
* | Merge pull request #2675 in HDFFV/hdf5 from bmr_HDFFV-10591-v110 to hdf5_1_10Binh-Minh Ribler2020-07-074-31/+63
|\ \ | |/ |/|
| * Fix HDFFV-10591Binh-Minh Ribler2020-07-054-31/+63
|/
* Merge pull request #2661 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf...Larry Knox2020-06-231-0/+2
|\
| * Fix MANIFESTDana Robinson2020-06-231-0/+2
|/
* Merge pull request #2651 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_...Allen Byrne2020-06-222-0/+31
|\
| * Correct arg referencesAllen Byrne2020-06-221-3/+3
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2020-06-2216-259/+367
| |\
| * | HDFFV-11111 correct ifdef logicAllen Byrne2020-06-181-2/+2
| * | HDFFV-11111 add unimplemented errors in JNIAllen Byrne2020-06-182-0/+31
* | | Merge pull request #2657 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf...Larry Knox2020-06-2212-63/+575
|\ \ \ | |_|/ |/| |
| * | Merge pull request #2656 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:changes_1_12_mer...Larry Knox2020-06-2112-63/+575
| |/
* | Merge pull request #2658 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normaliza...Dana Robinson2020-06-2216-259/+367
|\ \ | |/ |/|
| * Reduce overhead for H5open, which is involved in the public symbols like H5T_...Dana Robinson2020-06-222-5/+32
| * Merge branch 'hdf5_1_10' into 1_10_normalizationDana Robinson2020-06-203-6/+23
| |\ | |/ |/|
* | Merge pull request #2645 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/110_H...Vailin Choi2020-06-153-6/+23
|\ \
| * | Merge pull request #2643 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV...Vailin Choi2020-06-113-6/+23
|/ /
| * H5PB and H5Faccum normalization with develop.Dana Robinson2020-06-0412-190/+265
| * H5F normalizations with develop.Dana Robinson2020-06-045-64/+70
|/
* Merge pull request #2624 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normaliza...Dana Robinson2020-06-042-401/+349
|\
| * Merge branch '1_10_normalization' of https://bitbucket.hdfgroup.org/scm/~dero...Dana Robinson2020-06-041-270/+246
| |\
| | * Normalization of H5D.c with develop.Dana Robinson2020-06-041-270/+246
| |/ |/|
* | Merge pull request #2620 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normaliza...Dana Robinson2020-06-024-93/+116
|\ \
* \ \ Merge pull request #2618 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normaliza...Dana Robinson2020-06-019-157/+154
|\ \ \
| | | * Normalization of H5T.c with develop.Dana Robinson2020-06-041-131/+103
| | |/
| | * Normalization with develop in H5D and H5CX.Dana Robinson2020-06-024-93/+116
| | * Merge branch 'hdf5_1_10' into 1_10_normalizationDana Robinson2020-06-010-0/+0
| | |\ | |/ / | | / | |/ |/|
* | Merge pull request #2617 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:1_10_normaliza...Dana Robinson2020-05-3036-867/+875
|\ \