summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge and fixkmu2020-01-21239-5185/+15127
|\
| * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ↵kmu2020-01-21240-5175/+15160
| |\ | | | | | | | | | develop
| | * Merge pull request #2286 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-01-201-2/+2
| | |\ | | | | | | | | | | | | | | | | * commit '59f19282b34b5dcc29a2921fdbd475833d4f6b92': Only 2 versions of H5O_info_t and H5O_iterate_t.
| | | * Only 2 versions of H5O_info_t and H5O_iterate_t.Larry Knox2020-01-201-2/+2
| | |/
| | * Merge pull request #2280 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2020-01-201-7/+7
| | |\ | | | | | | | | | | | | | | | | * commit '9e610d835b74f01320fdc777086c88ef40b0b0a2': H5vers.txt has versions v10 that should be v110 and some missing v110 entries.
| | | * H5vers.txt has versions v10 that should be v110 and some missing v110Larry Knox2020-01-191-7/+7
| | | | | | | | | | | | | | | | entries.
| | * | Merge pull request #2285 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-01-201-0/+5
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | to develop * commit '2f606a7c62c67d09835f004bad11fff6a76fc918': PATH_MAX fix in efc test for Windows.
| | | * PATH_MAX fix in efc test for Windows.Dana Robinson2020-01-201-0/+5
| | |/
| | * Merge pull request #2269 in HDFFV/hdf5 from ↵Dana Robinson2020-01-1814-505/+1131
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~DEROBINS/hdf5_der:stack_size_warnings to develop * commit '44739ccd4715cc9e15595575700e945341fcdbcc': Tidying from code review. Fixed stack and frame size warnings. Not complete, but fixes most of the easier cases.
| | | * Merge branch 'develop' into stack_size_warningsDana Robinson2020-01-17302-5824/+15500
| | | |\
| | | * | Tidying from code review.Dana Robinson2020-01-161-6/+20
| | | | |
| | | * | Fixed stack and frame size warnings. Not complete, but fixes most ofDana Robinson2020-01-1514-505/+1117
| | | | | | | | | | | | | | | | | | | | the easier cases.
| | * | | Merge pull request #2273 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:pi_config to ↵Dana Robinson2020-01-182-0/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit 'c7292efc1879cdbbbeae9503fbaf170bd19c8383': Removed UIUC from copyright, added helpful comment. Updated MANIFEST Added a config file for ARM (Tested on a Raspberry Pi 3B+ w/ gcc 6).
| | | * | | Removed UIUC from copyright, added helpful comment.Dana Robinson2020-01-181-2/+1
| | | | | |
| | | * | | Updated MANIFESTDana Robinson2020-01-171-0/+1
| | | | | |
| | | * | | Added a config file for ARM (Tested on a Raspberry Pi 3B+Dana Robinson2020-01-171-0/+17
| | | | |/ | | | |/| | | | | | | | | | | w/ gcc 6).
| | * | | Merge pull request #2274 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-01-173-4/+14
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * commit 'db65d57541dd766e9912fb0698210cd76107d328': Correct standalone function attributes Standalone should not use import/export attributes
| | | * | Correct standalone function attributesAllen Byrne2020-01-173-8/+13
| | | | |
| | | * | Standalone should not use import/export attributesAllen Byrne2020-01-171-0/+5
| | |/ /
| | * | Merge pull request #2272 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:tr_squash to ↵Dana Robinson2020-01-16225-4667/+13994
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit 'a92c735c9b57049e8c4037d3490f7e10f8eef4d6': Squashed commit of the token_refactoring branch:
| | | * | Squashed commit of the token_refactoring branch:Dana Robinson2020-01-16225-4667/+13994
| | |/ /
* | | | 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
| | | | |