summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * \ 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
| |/ /
| * | Description:Binh-Minh Ribler2017-03-201-2/+65
|/ /
* | Merge pull request #353 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-03-2011-24/+101
|\ \
| | * Remove incorrect " marks added to java files by bin/h5vers.lrknox2017-03-214-11/+12
| |/
| * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-203-180/+206
| |\ | |/ |/|
* | Merge pull request #351 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-03-203-180/+206
|\ \
| * | Add reference to CMake application framworkAllen Byrne2017-03-201-1/+3
| * | Whitespace changesAllen Byrne2017-03-201-148/+152
| * | Update notesAllen Byrne2017-03-201-31/+51
|/ /
| * Extend h5vers to update version strings in java files and h5repacklrknox2017-03-2010-24/+78
| * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-209-54/+2053
| |\ | |/ |/|
* | Merge pull request #350 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-03-202-8/+8
|\ \
| * | Use global variable for test command - update referenceAllen Byrne2017-03-202-8/+8
* | | Merge pull request #341 in HDFFV/hdf5 from ~MAINZER/hdf5_jrm:develop to developJohn Mainzer2017-03-207-46/+2045
|\ \ \ | |/ / |/| |
| * | Minor code changes to address comments in pull requestmainzer2017-03-174-7/+6
| * | Update required for checkin.mainzer2017-03-169-315/+410
| |\ \
| * | | Checkin of additions to cache image parallel test code andmainzer2017-03-167-46/+2046
| | | * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-204-55/+73
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #348 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp2:develop to...Larry Knox2017-03-204-55/+73
|\ \ \ \
| * | | | Description:Binh-Minh Ribler2017-03-201-8/+0
| * | | | Purpose: Add new C++ wrappersBinh-Minh Ribler2017-03-194-47/+73
|/ / / /
| | | * Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk...lrknox2017-03-172-2/+66
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #344 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp2:develop to...Binh-Minh Ribler2017-03-172-2/+66
|\ \ \ \
| * | | | Description:Binh-Minh Ribler2017-03-171-4/+4
| * | | | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2017-03-178-47/+135
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Description:Binh-Minh Ribler2017-03-172-2/+66
| | | | * Run swmr tests in their own subdirectory of test to avoid signallrknox2017-03-171-0/+23
| |_|_|/ |/| | |
* | | | Merge pull request #342 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp2:develop to...Binh-Minh Ribler2017-03-1738-183/+219
|\ \ \ \ | |/ / /
| * | | Description:Binh-Minh Ribler2017-03-1738-183/+219
* | | | Merge pull request #340 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-03-178-47/+135
|\ \ \ \ | |/ / / |/| | |
| * | | Add toolset option to cmake configureAllen Byrne2017-03-172-2/+11
| * | | Update cmake pubconf to match autotools and add strtoll checksAllen Byrne2017-03-166-45/+124
| | |/ | |/|
* | | Merge pull request #334 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp2:develop to...Binh-Minh Ribler2017-03-1615-14/+490
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_b...Binh-Minh Ribler2017-03-1428-824/+2060
| |\ \
| * | | Purpose: Add new C++ wrappersBinh-Minh Ribler2017-03-1415-14/+490
* | | | Merge pull request #336 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2017-03-168-314/+409
|\ \ \ \
| * \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2017-03-161-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #339 in HDFFV/hdf5 from merge_page_buffering_10 to developQuincey Koziol2017-03-161-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Switch from HDatoll to HDstrtoll, for Windows compatibility.Quincey Koziol2017-03-161-1/+1
|/ / / /
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2017-03-163-11/+39
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #338 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2017-03-162-5/+37
|\ \ \ \
| * | | | output_filter.sh:lrknox2017-03-152-5/+37
|/ / / /
* | | | Merge pull request #337 in HDFFV/hdf5 from merge_page_buffering_09 to developQuincey Koziol2017-03-151-6/+2
|\ \ \ \