summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #2477 in HDFFV/hdf5 from pio_update to develop"Larry Knox2020-08-184-48/+0
* Merge pull request #2801 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:swmr_test_fail...Larry Knox2020-08-181-1/+1
|\
| * Fixes CMake issue with file locking variableDana Robinson2020-08-181-1/+1
* | Merge pull request #2795 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr2020:hdf5_bmr20...Larry Knox2020-08-183-1/+8
|\ \
| * | Fixed typoBinh-Minh Ribler2020-08-181-1/+1
| * | Fix HDFFV-11101Binh-Minh Ribler2020-08-172-0/+7
* | | Merge pull request #2477 in HDFFV/hdf5 from pio_update to developLarry Knox2020-08-184-0/+48
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into pio_updateQuincey Koziol2020-08-161009-34390/+36775
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/develop' into pio_updateQuincey Koziol2020-04-1969-2036/+13145
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into pio_updateQuincey Koziol2020-04-0970-1511/+1907
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into pio_updateQuincey Koziol2020-04-042-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into pio_updateQuincey Koziol2020-04-0322-565/+790
| |\ \ \ \ \ \ \
| * | | | | | | | Don't track file offset position when using pread / pwrite.Quincey Koziol2020-03-294-32/+80
* | | | | | | | | Merge pull request #2734 in HDFFV/hdf5 from ~DYOUNG/werror:cse to developLarry Knox2020-08-181-96/+106
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve code readability: extract common subexpressions into temporaryDavid Young2020-08-041-96/+106
* | | | | | | | | | Merge pull request #2735 in HDFFV/hdf5 from ~DYOUNG/werror:virtual-write-one ...Larry Knox2020-08-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix a bug in H5D__virtual_write_one to stop an assertion from failingDavid Young2020-08-041-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2794 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5f_start_swmr...Dana Robinson2020-08-175-12/+127
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Moves lock flag to H5F_shared_t and adds test.Dana Robinson2020-08-175-15/+118
| * | | | | | | | | Adds fix for H5Fstart_swmr_write lock issueDana Robinson2020-08-172-4/+16
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2769 in HDFFV/hdf5 from mdc_sl_opt to developJohn Mainzer2020-08-1715-1837/+3630
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Minor copy edits to comments -- no code changes.inactive/mdc_sl_optmainzer2020-08-173-3/+3
| * | | | | | | | Merge branch 'develop' into mdc_sl_optmainzer2020-08-15364-10247/+6767
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Tab to space conversions.mainzer2020-08-147-465/+463
| * | | | | | | | | Merge branch 'develop' into mdc_sl_optmainzer2020-08-13196-3757/+5236
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | When flushing, the metadata cache attempts to flush entries in increasingmainzer2020-08-0515-1857/+3651
* | | | | | | | | | | Merge pull request #2784 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-08-172-10/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 1. HDFFV-10830 part 2, move AC_CHECK_HEADERS([szlib.h] afterLarry Knox2020-08-162-10/+10
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #2771 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr:hdf5_bmr_HDFFV...Binh-Minh Ribler2020-08-165-14/+199
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed HDFFV-10933Binh-Minh Ribler2020-08-145-14/+199
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #2779 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-08-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix javadoc warningAllen Byrne2020-08-161-0/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2776 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-08-165-4/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add testfilesAllen Byrne2020-08-151-0/+7
| * | | | | | | | | | TRILABS-277 Use JIRA number as #ifdefAllen Byrne2020-08-155-4/+50
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2768 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-08-1537-120/+2079
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-08-1511-66/+65
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2773 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-08-1511-66/+65
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Trivialities noticed while merging things to 1.10Dana Robinson2020-08-1511-66/+65
|/ / / / / / / / / /
| * | | | | | | | | HDFFV-9984 fix test logicAllen Byrne2020-08-142-6/+5
| * | | | | | | | | HDFFV-9984 - correct name of ref filesAllen Byrne2020-08-145-0/+0
| * | | | | | | | | HDFFV-9984 add missing ref fileAllen Byrne2020-08-141-0/+28
| * | | | | | | | | HDFFV-9984 - add missing ref filesAllen Byrne2020-08-147-0/+541
| * | | | | | | | | HDFFV-9984 Add options to merge/prune external links during repackAllen Byrne2020-08-1431-120/+1511
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2765 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ...Dana Robinson2020-08-141-10/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixes naming issues in H5VM inline functionsDana Robinson2020-08-141-10/+10
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2753 in HDFFV/hdf5 from ~EPOURMAL/hdf5_ep:develop to developElena Pourmal2020-08-142-54/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Addresseda Dana's comments from the pull request.Elena2020-08-141-29/+32
| * | | | | | | | | Fixed several typos in the comments found by Larry during the review.Elena2020-08-121-3/+3
| * | | | | | | | | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~epourmal/hdf5_e...Elena2020-08-122-6/+6
| |\ \ \ \ \ \ \ \ \