summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #241 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to dev...Vailin Choi2017-01-101-0/+4
|\
| * Skip h5watch testsVailin Choi2017-01-101-0/+4
|/
* Merge pull request #240 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to developScot Breitenfeld2017-01-061-45/+42
|\
| * Enabled commented out code,M. Scot Breitenfeld2017-01-061-45/+42
* | Merge pull request #239 in HDFFV/hdf5 from develop_merge_cache_image_05 to de...Dana Robinson2017-01-0621-57/+663
|\ \ | |/ |/|
| * Bring changes to metadata cache "get entry status" call and newQuincey Koziol2017-01-0618-17/+614
| * Add "image up to date" flag / parameter to metadata cache entry status calls.Quincey Koziol2017-01-067-40/+49
* | Merge pull request #238 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp:develop to ...Binh-Minh Ribler2017-01-061-0/+2
|\ \ | |/ |/|
| * Description:Binh-Minh Ribler2017-01-051-0/+2
|/
* Merge pull request #237 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-01-053-50/+49
|\
| * Corrected return calls from main()Allen Byrne2017-01-051-5/+4
| * Corrected return callsAllen Byrne2017-01-052-10/+6
| * Fix valgrind memory leakAllen Byrne2017-01-051-28/+30
| * Clean up valgrind memory leakAllen Byrne2017-01-051-14/+16
* | Merge pull request #236 in HDFFV/hdf5 from develop_merge_cache_image_04 to de...Dana Robinson2017-01-0531-529/+2259
|\ \ | |/ |/|
| * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ...Quincey Koziol2017-01-0535-83/+416
| |\ | |/ |/|
* | Merge pull request #232 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp:develop to ...Binh-Minh Ribler2017-01-0535-83/+416
|\ \
| * | Description:Binh-Minh Ribler2017-01-041-0/+2
| * | Removed commented section left in by mistake.Binh-Minh Ribler2017-01-031-8/+0
| * | Purpose: Add more testsBinh-Minh Ribler2017-01-034-23/+45
| * | Purpose: Add new wrappersBinh-Minh Ribler2016-12-2832-74/+391
| | * Bring file shutdown code from cache image branchQuincey Koziol2017-01-0527-257/+1749
| | * Merge code from cache image branch to split FSM ring into two types: raw dataQuincey Koziol2017-01-044-56/+242
| | * Align w/incoming cache image changes, and improve recovery on errors.Quincey Koziol2017-01-041-23/+23
| | * Revert accidental changes to freespace open and close routines.Quincey Koziol2017-01-031-4/+4
| | * Remove 'const' from cache client pre_serialize callback, to reduce warnings,Quincey Koziol2017-01-0314-98/+104
| | * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ...Quincey Koziol2017-01-023-353/+532
| | |\ | |_|/ |/| |
* | | Merge pull request #231 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to developDana Robinson2017-01-021-1/+1
|\ \ \
| * | | Fixed a macro in H5Cpkg.h that was only updated in the version thatDana Robinson2017-01-021-1/+1
|/ / /
* | | Merge pull request #227 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:flush_vfd_fix t...Dana Robinson2016-12-312-352/+531
|\ \ \
| * | | Updated the flush1/2 test to not be a mess and to handleDana Robinson2016-12-302-352/+531
| | | * Align with incoming cache_image branch changes: use the index list (instead ofQuincey Koziol2017-01-022-103/+149
| |_|/ |/| |
* | | Merge pull request #216 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2016-12-301-0/+15
|\ \ \
| * \ \ Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2016-12-2334-176/+2698
| |\ \ \
| * | | | AM_MAINTAINER_MODE should be set to "disable" for releases. Check tolrknox2016-12-231-0/+15
* | | | | Merge pull request #226 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:flush_vfd_fix t...Dana Robinson2016-12-304-1/+67
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Added a missing test file needed for the flushrefresh script.Dana Robinson2016-12-304-1/+67
* | | | | Merge pull request #225 in HDFFV/hdf5 from develop_merge_cache_image_03 to de...Dana Robinson2016-12-3015-604/+1001
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bring support for doubly-linked list of all entries in cache from incomingQuincey Koziol2016-12-306-158/+414
| * | | | Align with name change of "user" ring in incoming cache image changes.Quincey Koziol2016-12-303-4/+4
| * | | | Refactor several cache clients to have only one copy of their deserializationQuincey Koziol2016-12-306-442/+583
|/ / / /
* | | | Merge pull request #223 in HDFFV/hdf5 from develop_merge_cache_image_02 to de...Dana Robinson2016-12-2928-364/+235
|\ \ \ \
| * | | | More normalizations against incoming cache image branch.Quincey Koziol2016-12-2928-364/+235
* | | | | Merge pull request #200 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:name_macros to ...Dana Robinson2016-12-291-1/+1
|\ \ \ \ \
| * | | | | Added text to the function check macros so that a more helpfulDana Robinson2016-12-121-1/+1
* | | | | | Merge pull request #222 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5Odtype_tidy t...Dana Robinson2016-12-291-138/+149
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Cleaned up H5Odtype.cDana Robinson2016-12-291-138/+149
| | |_|_|/ | |/| | |
* | | | | Merge pull request #221 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2016-12-284-37/+38
|\ \ \ \ \
| * \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2016-12-282-116/+104
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #220 in HDFFV/hdf5 from develop_merge_cache_image to developQuincey Koziol2016-12-282-116/+104
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |