summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Incorporate patch from GE Healthcare (HDFFV-9934)Vailin Choi2017-04-259-158/+898
| | | | | This is the same patch that had already been integrated to 1.8 branch (pull request #387). Tested on moohan, ostrich, platypus, emu, osx1010test, quail, kituo, mayll.
* Merge pull request #470 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-251-83/+3
|\ | | | | | | | | * commit '2420df5a85c64a20d98165c5b8c891899b31da83': HDFFV-10170 revert entire change
| * 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
|\ | | | | | | | | | | * commit '89fbe00dec8187305b518d91c3ddb7d910665f79': Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10 Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes.
| * Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to ↵Larry Knox2017-04-251530-8768/+22220
| | | | | | | | | | | | | | | | | | | | hdf5_1_10 * commit '54957d37f5aa73912763dbb6e308555e863c43f4': Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes. Add new files in release_docs to MANIFEST. Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running autogen.sh. Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1 Change copyright headers to replace url referring to file to be removed and replace it with new url for COPYING file.
| * Commit copyright header change for src/H5PLpkg.c which was added after ↵lrknox2017-04-251-6/+4
|/ | | | running script to make changes.
* Merge pull request #464 in HDFFV/hdf5 from ↵Dana Robinson2017-04-252-30/+48
|\ | | | | | | | | | | | | ~DEROBINS/hdf5_der:bin_trace_complain to develop * commit 'b1a5ba405393da68028cf1c8b159a3abb51d2187': Updated bin/trace to emit errors and reordered autogen.sh processing so that script failures leave the library in a non-compilable state, making it harder to ignore errors.
| * Updated bin/trace to emit errors and reordered autogen.sh processingDana Robinson2017-04-252-30/+48
|/ | | | | so that script failures leave the library in a non-compilable state, making it harder to ignore errors.
* Merge pull request #457 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-247-43/+62
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fb5ce7ad50664f800ffe7e107e0fb0f90f66e12': Correct name of native function Fix javadoc Fix typo Signature change requires a ptr Change H5PLsize() signature Revert HDFFV-9655 Changed signature of H5PLgetsize Revert HDFFV-9655 by disabling test and not using new function. Fix path to actual executable location Windows ahs one more directory level
| * 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
| |\ | |/ |/| | | | | * commit '2deb953dbbde17712723529c4bca6a2bf3eedf6b': Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files (1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure
* | Merge pull request #453 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to ↵Vailin Choi2017-04-2424-867/+508
|\ \ | | | | | | | | | | | | | | | | | | develop * commit 'e9b289a3d1d031f594e8c5421144ac44f3d44bcb': Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files (1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure
| * | Fix for HDFFV-10166 h5watch tests fail randomly to match expected output filesVailin Choi2017-04-2124-867/+508
| | | | | | | | | | | | | | | (1) Re-structure tests to do one "extend" action at a time (2) Re-try test till max limit before final failure
| | * 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
|\ \ | |/ |/| | | | | * commit 'ebb7bc7fadb86c48869439ea9137f1dfc1e1f158': Comment out failing plugin test until fixed (unexpected .libs in plugin test directory path with '@').
| * Comment out failing plugin test until fixed (unexpected .libs in plugin test ↵lrknox2017-04-221-11/+11
|/ | | | directory path with '@').
* Merge pull request #449 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-04-216-13/+45
|\ | | | | | | | | | | * commit '7bd516f2ead21e8470cc25c0b664ad6b56c723a0': Our best effort to build dynamic plugin tests and not install them with "make install". It seems the install-exec-hook doesn't remove the last to be installed. Add targets for plugin test libraries to avoid linking to external libs.
| * Our best effort to build dynamic plugin tests and not install them withlrknox2017-04-216-28/+44
| | | | | | | | | | "make install". It seems the install-exec-hook doesn't remove the last to be installed.
| * 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 ↵Allen Byrne2017-04-213-19/+114
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | ~BYRN/hdf5_adb:bugfix/HDFFV-9655-plugin-path-relative to develop * commit 'a995a63085d88e1a633770536efeff5b01569445': HDFFV-9655 fix test and some warnings HDFFV-9655 fix compile and test HDFFV-9655 - Add functions for '@' - untested
| * | HDFFV-9655 fix test and some warningsAllen Byrne2017-04-211-3/+3
| | |
| * | Merge remote-tracking branch 'origin/develop' intoAllen Byrne2017-04-2183-1476/+3307
| |\ \ | | | | | | | | | | | | bugfix/HDFFV-9655-plugin-path-relative
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abdb412d50bcdfc158e6efddc9eb4aba4f8bce1e': file already in list Fix parameter form
| * | | | 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
|\ \ \ | |/ / |/| | | | | | | | * commit 'b96db2f074c69d95f66917822ffb359a8e401cc7': Fixed problems that prevent bin/trace from marking up some functions.
| * | Merge branch 'develop' of ↵Dana Robinson2017-04-212-35/+102
| |\ \ | |/ / |/| | | | | https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop
* | | Merge pull request #448 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-04-202-35/+102
|\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '9a7b106d3776a8454b5cb9443f11aae2873cc617': Correct test options to match autotools script Updates to CMake for the changes in the autotools script
| * | | 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 ↵Dana Robinson2017-04-203-3/+126
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | ~DEROBINS/hdf5_der:eoc_parallel_prevent to develop * commit '5ed622b9ca432f1b440e8903680695ac83e28301': The cache_image test shows a skipped message about EoC in parallel. Added code to disable the evict-on-close feature in the parallel library.
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | * commit 'ea46fbe7c2bb3a8c8972c880f3609be20036d741': Correct typo of file name
| * | | Correct typo of file nameAllen Byrne2017-04-201-1/+1
|/ / /
* | | Merge pull request #435 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to ↵Vailin Choi2017-04-2010-84/+102
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit '43e03c548ae2c405b92f95833251683d3eeb1440': Modifications based on review comments from pull request. Made changes according to review comments and discussion with Allen. Fix for DAILYTEST-259 h5clear test failure Deposit the test files in test/misc/testfiles for testh5clear.sh to use instead of depending on h5clear_gentest. Tested on kituo, osx1010test, quail, platypus and ostrich.
| * | | Modifications based on review comments from pull request.Vailin Choi2017-04-204-106/+117
| | | | | | | | | | | | | | | | Made changes according to review comments and discussion with Allen.
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Vailin Choi2017-04-195-9/+18
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f34c3cfd46054f6478b34df6af324c353e44d62': Update tool dyn lib LDFLAGS module forces .so lib to be built on osx instead of .dylib java jni lib also needs to avoid the version-info HDFFV-10170 undo patch Add plugin options for libs
| * | | Merge branch 'develop' of ↵Vailin Choi2017-04-181-0/+12
| |\ \ \ | | | | | | | | | | | | | | | https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into develop