summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Squashed commit of the token_refactoring branch:Dana Robinson2020-01-16225-4667/+13994
* Merge pull request #2237 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:HDFFV-10992-fix t...Jerome Soumagne2020-01-157-18/+123
|\
| * Add test for reference shutdown issueJerome Soumagne2020-01-152-0/+84
| * H5R: set app ref when incrementing ref_count on location held by referenceJerome Soumagne2020-01-105-18/+39
* | Merge pull request #2270 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-1590-1091/+1199
|\ \
| * | HDFFV-11001 fix if blockAllen Byrne2020-01-151-3/+2
| * | HDFFV-11001 need to qualify all by parallel or serial typesAllen Byrne2020-01-1534-356/+363
| * | HDDFV-11001 add noteAllen Byrne2020-01-151-0/+14
| * | HDFFV-11001 Add fine control over testingAllen Byrne2020-01-1539-57/+138
| * | Adjust regex for warningsAllen Byrne2020-01-141-8/+8
| * | Update tools hid_t declarations with H5I_INVALID_HIDAllen Byrne2020-01-1347-719/+726
|/ /
* | Merge pull request #2263 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-131-0/+1
|\ \
| * | Ignore ZLIB warningsAllen Byrne2020-01-131-0/+1
|/ /
* | Merge pull request #2256 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-136-51/+186
|\ \
| * | Added JIRA noteAllen Byrne2020-01-131-0/+8
| * | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-01-101-2/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #2248 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-01-101-2/+1
|\ \ \
| * \ \ Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...Larry Knox2020-01-0910-320/+374
| |\ \ \ | |/ / / |/| | |
| * | | Modify external_env.c to prevent deleting test file of external.c.Larry Knox2020-01-091-2/+1
| | |/ | |/|
| | * io_timer.c uses a parallel lib functionAllen Byrne2020-01-102-4/+3
| | * Fix standalone compile issuesAllen Byrne2020-01-094-48/+176
| |/ |/|
* | Merge pull request #2239 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-098-316/+370
|\ \
| * | Separate result variables for the function performedAllen Byrne2020-01-093-88/+104
| * | Check for actual content before using fileAllen Byrne2020-01-095-264/+298
| * | HDFFV-10995 - add missing importAllen Byrne2020-01-082-0/+2
| * | HDFFV-10995 - need to add importAllen Byrne2020-01-082-0/+2
| * | HDFFV-10995 - Update all time instancesAllen Byrne2020-01-081-38/+38
| * | HDFFV-10995 adjust testing to tolerate non-US localeAllen Byrne2020-01-083-3/+3
| |/
* | Merge pull request #2244 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings t...Kimmy Mu2020-01-092-4/+4
|\ \ | |/ |/|
| * fix test assert fail errorkmu2020-01-092-4/+4
* | Merge pull request #2234 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings t...Kimmy Mu2020-01-071-0/+1
|\ \ | |/
| * add new type supportkmu2020-01-071-0/+1
* | Merge pull request #2071 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings t...Kimmy Mu2020-01-0647-113/+131
|\ \ | |/
| * address problems from commentskmu2019-12-116-7/+6
| * fix and address commentskmu2019-12-1111-35/+34
| * change according to previous commentskmu2019-12-102-4/+3
| * add missing piecekmu2019-12-101-0/+1
| * Merge branch 'develop' into bugfix/intel_warningskmu2019-12-09113-849/+1266
| |\
| | * Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2019-12-0658-523/+665
| | |\
| | * \ Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2019-12-0271-701/+976
| | |\ \
| * | | | remove unnecessary check macrokmu2019-12-0631-62/+53
| * | | | fix intel compile warningskmu2019-12-0445-105/+134
| |/ / /
| * | | Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2019-11-27120-944/+2253
| |\ \ \
| * | | | Revert "fix warnings from Intel compiler"kmu2019-11-2647-120/+100
| * | | | Revert "fix warnings and some text alignment"kmu2019-11-261-12/+14
| * | | | Revert "let hdf5 pick up the right compiler in Intel environment"kmu2019-11-264-121/+10
| * | | | Revert "fix issues from previous PR comments"kmu2019-11-2638-90/+77
| * | | | Revert "using a different MACRO"kmu2019-11-2635-103/+98
| * | | | using a different MACROkmu2019-11-2535-98/+103
| * | | | fix issues from previous PR commentskmu2019-11-2538-77/+90