summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Incorporate patch from GE Healthcare (HDFFV-9934)Vailin Choi2017-04-259-158/+898
* Merge pull request #470 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-251-83/+3
|\
| * HDFFV-10170 revert entire changeAllen Byrne2017-04-251-83/+3
|/
* Merge pull request #468 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-04-251531-8774/+22224
|\
| * Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5...Larry Knox2017-04-251530-8768/+22220
| * Commit copyright header change for src/H5PLpkg.c which was added after runnin...lrknox2017-04-251-6/+4
|/
* Merge pull request #464 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:bin_trace_compl...Dana Robinson2017-04-252-30/+48
|\
| * Updated bin/trace to emit errors and reordered autogen.sh processingDana Robinson2017-04-252-30/+48
|/
* Merge pull request #457 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-247-43/+62
|\
| * Correct name of native functionAllen Byrne2017-04-241-1/+1
| * Fix javadocAllen Byrne2017-04-241-2/+4
| * Fix typoAllen Byrne2017-04-241-1/+1
| * Signature change requires a ptrAllen Byrne2017-04-241-8/+8
| * Change H5PLsize() signatureAllen Byrne2017-04-241-8/+15
| * Revert HDFFV-9655Allen Byrne2017-04-241-5/+9
| * Changed signature of H5PLgetsizeAllen Byrne2017-04-241-6/+4
| * Revert HDFFV-9655 by disabling test and not using new function.Allen Byrne2017-04-243-19/+24
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2017-04-2424-867/+508
| |\ | |/ |/|
* | Merge pull request #453 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to dev...Vailin Choi2017-04-2424-867/+508
|\ \
| * | Fix for HDFFV-10166 h5watch tests fail randomly to match expected output filesVailin Choi2017-04-2124-867/+508
| | * Fix path to actual executable locationAllen Byrne2017-04-241-12/+13
| | * Windows ahs one more directory levelAllen Byrne2017-04-241-1/+3
| |/ |/|
* | Merge pull request #454 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-04-221-11/+11
|\ \ | |/ |/|
| * Comment out failing plugin test until fixed (unexpected .libs in plugin test ...lrknox2017-04-221-11/+11
|/
* Merge pull request #449 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-04-216-13/+45
|\
| * Our best effort to build dynamic plugin tests and not install them withlrknox2017-04-216-28/+44
| * Add targets for plugin test libraries to avoid linking to external libs.lrknox2017-04-202-4/+20
* | Merge pull request #447 in HDFFV/hdf5 from ~BYRN/hdf5_adb:bugfix/HDFFV-9655-p...Allen Byrne2017-04-213-19/+114
|\ \
| * | HDFFV-9655 fix test and some warningsAllen Byrne2017-04-211-3/+3
| * | Merge remote-tracking branch 'origin/develop' intoAllen Byrne2017-04-2183-1476/+3307
| |\ \
| * | | HDFFV-9655 fix compile and testAllen Byrne2017-04-213-47/+74
| * | | HDFFV-9655 - Add functions for '@' - untestedAllen Byrne2017-03-291-0/+68
* | | | Merge pull request #452 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-211-10/+0
|\ \ \ \
| * | | | file already in listAllen Byrne2017-04-211-10/+0
| | |/ / | |/| |
| * | | Fix parameter formAllen Byrne2017-04-211-4/+4
| | |/ | |/|
* | | Merge pull request #451 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to developDana Robinson2017-04-213-22/+20
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_d...Dana Robinson2017-04-212-35/+102
| |\ \ | |/ / |/| |
* | | Merge pull request #448 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-202-35/+102
|\ \ \
| * | | Correct test options to match autotools scriptAllen Byrne2017-04-201-15/+15
| * | | Updates to CMake for the changes in the autotools scriptAllen Byrne2017-04-202-20/+87
| | * | Fixed problems that prevent bin/trace from marking up some functions.Dana Robinson2017-04-213-22/+20
| |/ / |/| |
* | | Merge pull request #443 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:eoc_parallel_pr...Dana Robinson2017-04-203-3/+126
|\ \ \ | |/ / |/| |
| * | The cache_image test shows a skipped message about EoC in parallel.Dana Robinson2017-04-203-11/+9
| * | Merge branch 'develop' into eoc_parallel_preventDana Robinson2017-04-2011-85/+103
| |\ \ | |/ / |/| |
* | | Merge pull request #444 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-201-1/+1
|\ \ \
| * | | Correct typo of file nameAllen Byrne2017-04-201-1/+1
|/ / /
* | | Merge pull request #435 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to dev...Vailin Choi2017-04-2010-84/+102
|\ \ \
| * | | Modifications based on review comments from pull request.Vailin Choi2017-04-204-106/+117
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Vailin Choi2017-04-195-9/+18
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_f...Vailin Choi2017-04-181-0/+12
| |\ \ \