summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #390 in HDFFV/hdf5 from develop to hdf5_1_10Larry Knox2017-04-032-9/+10
|\
| * Merge pull request #389 in HDFFV/hdf5 from fix_h5watch_signal to developQuincey Koziol2017-04-031-4/+5
| |\
| | * Switch to using flag in signal handler, to trigger dropping out of main loopQuincey Koziol2017-04-031-4/+5
| |/
| * Merge pull request #374 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to...Binh-Minh Ribler2017-04-031-5/+5
| |\
| | * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2017-03-286-13/+82
| | |\
| | * | Fix HDFFV-8089Binh-Minh Ribler2017-03-281-5/+5
* | | | Merge pull request #385 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5...Larry Knox2017-03-3111-94/+996
|\ \ \ \
| * | | | Small corrections to DOPYING file.lrknox2017-03-311-2/+2
| * | | | Merge branch 'develop' into hdf5_1_10lrknox2017-03-3111-93/+995
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Merge pull request #382 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-03-301-0/+1
| |\ \ \
| | * \ \ Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-307-78/+886
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #376 in HDFFV/hdf5 from ~MAINZER/hdf5_jrm:develop to developJohn Mainzer2017-03-307-78/+886
| |\ \ \ \
| | * | | | Omnibus checkin for several relatively minor modifications:mainzer2017-03-287-78/+886
| | | |_|/ | | |/| |
| | | * | Add new file COPYING_LBNL_HDF5.lrknox2017-03-301-0/+1
| | |/ / | |/| |
| * | | Merge pull request #375 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-03-302-4/+60
| |\ \ \ | | |/ / | |/| |
| | * | Revert "Clear hdf5 1.10 entries from RELEASE.txt in the develop branch. Entr...lrknox2017-03-291-27/+332
| | * | Add LBNL license file and modify COPYING file accordingly.lrknox2017-03-292-4/+60
* | | | Merge pull request #377 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5...Larry Knox2017-03-286-289/+56
|\ \ \ \
| * | | | Resolve conflict missed in merge.lrknox2017-03-281-8/+0
| * | | | Merge branch 'develop' into hdf5_1_10lrknox2017-03-287-289/+64
| |\ \ \ \ |/ / / / / | | | _ / | | | /
| * | | Clear hdf5 1.10 entries from RELEASE.txt in the develop branch. Entrieslrknox2017-03-281-332/+27
| |/ /
| * | Merge pull request #373 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-03-273-8/+40
| |\ \
| | * | Update with extra checks for referenceAllen Byrne2017-03-271-3/+28
| | * | Update cdash max test output and VS version matchingAllen Byrne2017-03-272-5/+12
| |/ /
| * | Merge pull request #372 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developElena Pourmal2017-03-241-3/+3
| |\ \
| | * | Stop skipping h5watch tests.lrknox2017-03-241-3/+3
| |/ /
| * | Merge pull request #362 in HDFFV/hdf5 from merge_h5clear_revert_02 to developQuincey Koziol2017-03-241-0/+2
| |\ \
| | * | Add H5_DLL to H5AC_get_mdc_image_info() prototypeQuincey Koziol2017-03-241-1/+1
| | * | Add prototype for H5AC_get_mdc_image_infoQuincey Koziol2017-03-221-0/+2
| * | | Merge pull request #359 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to dev...Vailin Choi2017-03-231-2/+37
| |\ \ \
| | * | | Update RELEASE.txt based on review comments from pull request.Vailin Choi2017-03-231-8/+4
| | * | | Update RELEASE.txt to reflect changes for new features and bug fixes since 1....Vailin Choi2017-03-221-1/+40
| * | | | Merge pull request #363 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to...Binh-Minh Ribler2017-03-231-64/+2
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2017-03-2314-33/+198
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #361 in HDFFV/hdf5 from merge_h5clear_revert to developQuincey Koziol2017-03-226-15/+102
| |\ \ \
| | * | | Minor style cleanupsQuincey Koziol2017-03-224-7/+9
| | * | | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ...Quincey Koziol2017-03-224-6/+83
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #358 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-03-224-6/+83
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-220-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Run all scripts using signal files between processes in their own directories...lrknox2017-03-224-6/+83
| | | * | Revert "Switch h5clear for cache images to use existing H5Pget_cache_image_co...Quincey Koziol2017-03-226-15/+100
| | |/ / | |/| |
| * | | Merge pull request #356 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-03-214-12/+13
| |\ \ \ | | |/ /
| | * | Remove extra space added by h5vers to version string in H5.java, whichlrknox2017-03-212-2/+2
| | * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-2119-84/+182
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #355 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to...Binh-Minh Ribler2017-03-2118-82/+117
| |\ \ \
| | | * | Remove incorrect " marks added to java files by bin/h5vers.lrknox2017-03-214-11/+12
| | | | * Description:Binh-Minh Ribler2017-03-231-64/+2
| | | |/ | | |/|
| | * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2017-03-210-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #354 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to...Binh-Minh Ribler2017-03-211-2/+65
| |\ \ \
| | | * | Description:Binh-Minh Ribler2017-03-2118-82/+117
| | |/ /