summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge and fix conflictkmu2020-01-19148-1330/+1525
|\
| * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ↵kmu2020-01-16293-5596/+10216
| |\ | | | | | | | | | develop
| | * Merge pull request #2237 in HDFFV/hdf5 from ~JSOUMAGNE/hdf5:HDFFV-10992-fix ↵Jerome Soumagne2020-01-157-18/+123
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | to develop * commit 'a7648879d729c1b75bd32f3a151831e9cbfbe31c': Add test for reference shutdown issue H5R: set app ref when incrementing ref_count on location held by reference (fix HDFFV-10992)
| | | * 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
| | | | | | | | | | | | | | | | (fix HDFFV-10992)
| | * | Merge pull request #2270 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-1590-1091/+1199
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f73103745e9b9165e9d399ddb5b9991d7fb2a9e5': HDFFV-11001 fix if block HDFFV-11001 need to qualify all by parallel or serial types HDDFV-11001 add note HDFFV-11001 Add fine control over testing Adjust regex for warnings Update tools hid_t declarations with H5I_INVALID_HID
| | | * | 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 and fix conflictskmu2020-01-14307-9923/+21657
|\ \ \ \
| * \ \ \ Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2020-01-14225-4497/+8904
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge pull request #2263 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-131-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '06cff24b8de3d0cb60f89b2c200a98583dd136de': Ignore ZLIB warnings
| | | * | 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1385457eb2874b75fd7b9fa0c470e9e4225a104e': Added JIRA note io_timer.c uses a parallel lib function Fix standalone compile issues
| | | * | Added JIRA noteAllen Byrne2020-01-131-0/+8
| | | | |
| | | * | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-01-101-2/+1
| | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'd14b96e95976967c03c7623f6800506b89292656': Modify external_env.c to prevent deleting test file of external.c. Fix for HDFFV-10941.
| | * | | Merge pull request #2248 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-01-101-2/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '278980a654061b969a5b39b72fc3da6327f8aabf': Modify external_env.c to prevent deleting test file of external.c. Fix for HDFFV-10941.
| | | * \ \ Merge branch 'develop' of ↵Larry Knox2020-01-0910-320/+374
| | | |\ \ \ | | | |/ / / | | |/| | | | | | | | | https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop
| | | * | | Modify external_env.c to prevent deleting test file of external.c.Larry Knox2020-01-091-2/+1
| | | | |/ | | | |/| | | | | | | | | | | Fix for HDFFV-10941.
| | | | * 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
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '21f3d628d702bfd6c9cbb4b90f18842023ea40b3': Separate result variables for the function performed Check for actual content before using file HDFFV-10995 - add missing import HDFFV-10995 - need to add import HDFFV-10995 - Update all time instances HDFFV-10995 adjust testing to tolerate non-US locale
| | | * | 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 ↵Kimmy Mu2020-01-092-4/+4
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | to develop * commit '6b1b4b3c0bdd803835efe8c531965bb9900a5363': fix test assert fail error
| | | * fix test assert fail errorkmu2020-01-092-4/+4
| | | |
| | * | Merge pull request #2234 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings ↵Kimmy Mu2020-01-071-0/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | to develop * commit '30ac64d83aff5e022d51a17fd6c1d72903ae4f02': add new type support
| | | * add new type supportkmu2020-01-071-0/+1
| | | |
| | * | Merge pull request #2071 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings ↵Kimmy Mu2020-01-0647-113/+131
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to develop * commit '0a2bb11b248df6841daabca3970df5d8504adfc7': address problems from comments fix and address comments change according to previous comments add missing piece remove unnecessary check macro fix intel compile warnings Revert "fix warnings from Intel compiler" Revert "fix warnings and some text alignment" Revert "let hdf5 pick up the right compiler in Intel environment" Revert "fix issues from previous PR comments" Revert "using a different MACRO" using a different MACRO fix issues from previous PR comments let hdf5 pick up the right compiler in Intel environment fix warnings and some text alignment fix warnings from Intel compiler
| | | * 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
| | | |\
| | | * | remove unnecessary check macrokmu2019-12-0631-62/+53
| | | | |
| | | * | fix intel compile warningskmu2019-12-0445-105/+134
| | | | |
| | * | | Merge pull request #2228 in HDFFV/hdf5 from ↵Quincey Koziol2020-01-0443-541/+699
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor_improvements_from_token_refactor to develop * commit '0225e6d59698c9a720177766794619c7ad273f4a': Small changes from the token_refactoring branch, to reduce the delta to develop
| | | * | | Small changes from the token_refactoring branch, to reduce the delta to developQuincey Koziol2020-01-0443-541/+699
| | | | | |
| | * | | | Merge pull request #2226 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to developJordan Henderson2020-01-0315-117/+102
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'ccf177344ae2d4b03802adecc08a6cc956a7dac5': Fix some places where H5P_DEFAULT gets passed down to a VOL connector
| | | * | | Fix some places where H5P_DEFAULT gets passed down to a VOL connectorJordan Henderson2020-01-0315-117/+102
| | |/ / /
| | * | | Merge pull request #2221 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-01-022-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to develop * commit '1a50056dafc8e22facda675acb43a71705fdd15c': Changed -Wformat-truncation to level 2 in CMake w/ gcc. Changed -Wformat-truncation's level from 2 to 1.
| | | * | | Changed -Wformat-truncation to level 2 in CMake w/ gcc.Dana Robinson2020-01-011-1/+1
| | | | | |
| | | * | | Changed -Wformat-truncation's level from 2 to 1.Dana Robinson2020-01-011-1/+1
| | | | | |
generated by cgit v0.12 at 2024-07-21 16:37:06 (GMT)