summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1559 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-02-1848-375/+364
|\
| * Update standard checkAllen Byrne2019-02-171-6/+4
| * Fix typoAllen Byrne2019-02-171-1/+1
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-02-1722-3977/+1898
| |\ | |/ |/|
* | Merge pull request #1558 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2019-02-171-1/+1
|\ \
| * | Remove ' ' (typo).Larry Knox2019-02-171-1/+1
|/ /
* | Merge pull request #1547 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp5:develop t...Binh-Minh Ribler2019-02-167-345/+243
|\ \
| * | Code improvementBinh-Minh Ribler2019-02-163-282/+13
| * | Removed an extra "using" statementBinh-Minh Ribler2019-02-151-2/+0
| * | Adding documentationBinh-Minh Ribler2019-02-151-1/+7
| * | Added C++ wrapper for H5Ovisit2Binh-Minh Ribler2019-02-141-44/+4
| * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2019-02-147-11/+19
| |\ \
| * | | Adding a C++ wrapperBinh-Minh Ribler2019-02-145-35/+238
* | | | Merge pull request #1548 in HDFFV/hdf5 from merge_hyperslab_updates_04 to dev...Quincey Koziol2019-02-1514-3631/+1654
|\ \ \ \ | |_|/ / |/| | |
| * | | More changes to align with incoming selection improvements.Quincey Koziol2019-02-1414-3631/+1654
| |/ /
| | * HDFFV-10703 Update version match logicAllen Byrne2019-02-151-25/+25
| | * HDFFV-10703 revert pre-3.11 optionAllen Byrne2019-02-153-4/+68
| | * HDFFV-10703 macro vars need quotesAllen Byrne2019-02-155-13/+12
| | * HDFFV-10703 Update CMake commands to latest standardAllen Byrne2019-02-1548-407/+335
| | * Use correct variable nameAllen Byrne2019-02-141-1/+1
| |/ |/|
* | Merge pull request #1544 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-02-147-11/+19
|\ \ | |/ |/|
| * Use STREQUALAllen Byrne2019-02-141-1/+1
| * Add command to build options and check definesAllen Byrne2019-02-143-10/+14
| * Skip testing of cache_image testAllen Byrne2019-02-143-0/+4
| * CMake if statement correctionAllen Byrne2019-02-142-3/+3
|/
* Merge pull request #1540 in HDFFV/hdf5 from merge_hyperslab_changes_01 to dev...Quincey Koziol2019-02-1420-2247/+2256
|\
| * Merge remote-tracking branch 'origin/develop' into merge_hyperslab_changes_01Quincey Koziol2019-02-131-10/+13
| |\
| * | Align develop with incoming hyperslab_updates branch changes.Quincey Koziol2019-02-1320-2247/+2256
* | | Merge pull request #1542 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-02-1314-285/+499
|\ \ \ | |_|/ |/| |
| * | TRILAB-111 fixes for parallel testingAllen Byrne2019-02-1314-285/+499
|/ /
* | Merge pull request #1539 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developLarry Knox2019-02-131-10/+13
|\ \ | |/ |/|
| * Add missing toolchain include for cross-compileAllen Byrne2019-02-131-0/+1
| * KNL option for batch scriptsAllen Byrne2019-02-121-10/+12
|/
* Merge pull request #1534 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to developJordan Henderson2019-02-1223-35/+399
|\
| * Fixes for JNI updatesJordan Henderson2019-02-1223-35/+399
|/
* Merge pull request #1523 in HDFFV/hdf5 from ~JHENDERSON/hdf5:develop to developJordan Henderson2019-02-1211-87/+381
|\
| * Add RELEASE.txt note for collective metadata read fixesJordan Henderson2019-02-121-0/+16
| * Merge in latest from developJordan Henderson2019-02-12126-16482/+19094
| |\ | |/ |/|
* | Merge pull request #1533 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-02-1117-38/+38
|\ \
| * | Refactor mpi test namesAllen Byrne2019-02-1117-38/+38
|/ /
* | Merge pull request #1530 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developLarry Knox2019-02-1125-338/+263
|\ \
| * | Refactor parallel test namesAllen Byrne2019-02-1110-10/+10
| * | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-02-1156-16057/+18127
| |\ \ | |/ / |/| |
* | | Merge pull request #1532 in HDFFV/hdf5 from ~JHENDERSON/hdf5_merge:develop to...Allen Byrne2019-02-1156-16057/+18127
|\ \ \
| * | | Re-write of Java JNI error handlingJordan Henderson2019-02-1156-16057/+18127
|/ / /
| * | Rename parallel tests to start with PAR_Allen Byrne2019-02-116-12/+12
| * | Distinguish parallel performance testsAllen Byrne2019-02-111-2/+2
| * | Set the full generator nameAllen Byrne2019-02-111-1/+2
| * | Add new cmake copy file tests to ignoreAllen Byrne2019-02-111-0/+8
| * | Use correct values for other file versionsAllen Byrne2019-02-092-12/+12