summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #962 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10Allen Byrne2018-03-151-0/+8
|\ \ \
| * | | HDFFV-10412 - Add note for new Java wrapperAllen Byrne2018-03-151-0/+8
|/ / /
* | | Merge pull request #960 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5...Larry Knox2018-03-149-20/+20
|\ \ \
| * | | Updated version to 1.10.3-snap0lrknox2018-03-149-20/+20
|/ / /
* | | Merge pull request #957 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5...Larry Knox2018-03-141-3/+43
|\ \ \
| * \ \ Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 int...lrknox2018-03-142-6/+2
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #952 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_10 to hdf5_1_10Allen Byrne2018-03-146-19/+45
|\ \ \ \
| * | | | Remove duplicationAllen Byrne2018-03-141-14/+2
| * | | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2018-03-1496-256/+1366
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | HDFFV-10412 add complemnt to java error_offAllen Byrne2018-03-134-1/+37
| * | | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2018-03-133-26/+29
| |\ \ \ \
| * \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2018-03-12253-9104/+13475
| |\ \ \ \ \
| * | | | | | Correct cutnpasteAllen Byrne2018-03-071-4/+0
| * | | | | | Merge changes from developAllen Byrne2018-03-076-347/+391
| * | | | | | Merge 10414, 10292, VFD fix from developAllen Byrne2018-03-065-4/+27
| | | | * | | Revised RELEASE.txt.lrknox2018-03-141-19/+21
| | | | * | | Merge commit '7f0650336191d0437d98edf1e0dc5d60da7051f6' into hdf5_1_10lrknox2018-03-144-1/+37
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Merge pull request #953 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to dev...Larry Knox2018-03-141-0/+38
| | | | | |\ \
| | | | | | * | Add info to release notes for:Vailin Choi2018-03-141-0/+38
| | | | | |/ /
| | | | | * | Merge pull request #951 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-03-144-1/+37
| | | | | |\ \
| | | | | | * | HDFFV-10412 add error on function for JavaAllen Byrne2018-03-134-1/+37
| | | | | |/ /
| | | | * | | Resolve merge conlicts in RELEASE.txt.lrknox2018-03-141-6/+38
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #943 in HDFFV/hdf5 from develop to hdf5_1_10Larry Knox2018-03-1396-256/+1366
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge pull request #948 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to developDana Robinson2018-03-131-0/+20
| |\ \ \ \
| | * | | | Added a "won't fix" RELEASE.txt entry for HDFFV-10356.Dana Robinson2018-03-131-0/+20
| * | | | | Merge pull request #949 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-03-131-27/+114
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Rework new tests into one macroAllen Byrne2018-03-131-25/+112
| | * | | | Fix CMake test namesAllen Byrne2018-03-131-6/+6
| |/ / / /
| * | | | Merge pull request #945 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:hdffv_10358 to ...Dana Robinson2018-03-134-4/+25
| |\ \ \ \
| | * | | | Added a fix for HDFFV-10358.Dana Robinson2018-03-134-4/+25
| * | | | | Merge pull request #947 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-10397-testp...Larry Knox2018-03-131-1/+5
| |\ \ \ \ \
| | * | | | | Add release note for HDFFFV-10397.lrknox2018-03-131-1/+5
| * | | | | | Merge pull request #946 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to...Binh-Minh Ribler2018-03-1352-146/+81
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fixed typoBinh-Minh Ribler2018-03-131-1/+1
| | * | | | | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2018-03-13128-2159/+1582
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #931 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to dev...Vailin Choi2018-03-1241-105/+1148
| |\ \ \ \ \ \
| | * | | | | | Enhancement to the tool h5clear (HDFFV-10360)Vailin Choi2018-03-1238-98/+1114
| | * | | | | | Fix for HDFFV-10209 VDS SWMR test failureVailin Choi2018-03-093-7/+34
| | | * | | | | Fixed documentationBinh-Minh Ribler2018-03-1352-146/+81
* | | | | | | | Merge pull request #942 in HDFFV/hdf5 from develop to hdf5_1_10Scot Breitenfeld2018-03-123-26/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge pull request #940 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-03-123-26/+29
| |\ \ \ \ \ \
| | * | | | | | Remove obsolete filesAllen Byrne2018-03-121-7/+0
| | * | | | | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-03-1231-448/+975
| | |\ \ \ \ \ \
| | * | | | | | | HDFFV-10418 adjust build commands to match main library buildAllen Byrne2018-03-122-19/+29
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | Merge pull request #934 in HDFFV/hdf5 from hdf5_1_10_merge to hdf5_1_10Scot Breitenfeld2018-03-12258-9449/+13881
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge branch 'develop' into hdf5_1_10_mergeM. Scot Breitenfeld2018-03-124-23/+150
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge pull request #941 in HDFFV/hdf5 from t_bigio_develop to developRichard Warren2018-03-121-316/+79
| | |\ \ \ \ \ \
| | | * | | | | | Unify the test (t_bigio.c) between hdf5_1_10 and developRichard Warren2018-03-121-316/+79
| | |/ / / / / /
| | * | | | | | Merge pull request #939 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:HDFFV-10397-testp...Larry Knox2018-03-121-1/+8
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Remove comparison to NULL for variables to be freed.lrknox2018-03-121-3/+3