summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2019-12-125-718/+732
|\
| * Merge pull request #2132 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-12-115-718/+732
| |\ | | | | | | | | | | | | * commit '8ef8f5fda952540dc18a43ccf65597089db175f9': HDFFV-10979 fix global name clash
| | * HDFFV-10979 fix global name clashAllen Byrne2019-12-115-718/+732
| |/
* | Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2019-12-118-647/+648
|\ \ | |/
| * Merge pull request #2130 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-12-116-23/+24
| |\ | | | | | | | | | | | | * commit '6e7dcf170b39885f8aa4e7a35d1dc54f1489b375': Fix issues found with ONLY_SHARED_LIBS option
| | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-12-112-624/+624
| | |\ | | |/ | |/| | | | | | | * commit '5d94490e38eae88c5180c6ce1b3f74d82f1dd600': Fix 2010 compile issues
| * | Merge pull request #2128 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to ↵Allen Byrne2019-12-112-624/+624
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop * commit '1d5bf068224df9582dfc2280525352967a02367b': Fix 2010 compile issues
| | * | Fix 2010 compile issuesAllen Byrne2019-12-112-624/+624
| |/ /
| | * Fix issues found with ONLY_SHARED_LIBS optionAllen Byrne2019-12-116-23/+24
| |/
* | Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into developkmu2019-12-11111-5211/+12465
|\ \ | |/
| * Merge pull request #2127 in HDFFV/hdf5 from ↵Richard Warren2019-12-111-2/+2
| |\ | | | | | | | | | | | | | | | | | | Fix_use_of_H5Dcreate_to_H5Dcreate2 to develop * commit '2a94589f55bae69a06f8d672a904b9870d7353d1': Change from using H5Dcreate to H5Dcreate2
| | * Change from using H5Dcreate to H5Dcreate2Richard Warren2019-12-111-2/+2
| |/
| * Merge pull request #2118 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to ↵Allen Byrne2019-12-118-180/+175
| |\ | | | | | | | | | | | | | | | | | | develop * commit '51e799551309e16558297469edef6e2d232a3246': HDFFV-10974 Change defines to eliminate Windows conflict
| | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-12-114-31/+15
| | |\ | | |/ | |/| | | | | | | | | | | | | * commit '6b670e353c1ea7f13ef72cc4297d9973102078bb': Correct assignment Fix java include, h5watch and remove clang tool. Add missing filenames
| * | Merge pull request #2123 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developLarry Knox2019-12-114-31/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2ef40feb8d1f5f31ab60f78bb37d2ba595aacb8': Correct assignment Fix java include, h5watch and remove clang tool. Add missing filenames
| | * \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-12-101-0/+6
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | * commit 'eb415973e81605e3c15bbb954d57dd5d42ad449c': Latest date first in RELEASE.txt Update RELEASE.txt with performance improvements
| | * | Correct assignmentAllen Byrne2019-12-101-1/+1
| | | |
| | * | Fix java include, h5watch and remove clang tool.Allen Byrne2019-12-103-29/+12
| | | |
| | * | Add missing filenamesAllen Byrne2019-12-091-2/+3
| | | |
| | | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-12-101-0/+6
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | * commit 'eb415973e81605e3c15bbb954d57dd5d42ad449c': Latest date first in RELEASE.txt Update RELEASE.txt with performance improvements
| * | | Merge pull request #2122 in HDFFV/hdf5 from ↵Chris Hogan2019-12-101-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | ~CHOGAN/hdf5:chogan/develop/release_txt to develop * commit '794d008375b094d4dd2d26b0bbf6d2c51fd39281': Latest date first in RELEASE.txt Update RELEASE.txt with performance improvements
| | * | Latest date first in RELEASE.txtChris Hogan2019-12-101-6/+6
| | | |
| | * | Update RELEASE.txt with performance improvementsChris Hogan2019-12-101-0/+6
| |/ /
| | * HDFFV-10974 Change defines to eliminate Windows conflictAllen Byrne2019-12-108-180/+175
| |/
| * Merge pull request #2113 in HDFFV/hdf5 from ↵Chris Hogan2019-12-091-0/+6
| |\ | | | | | | | | | | | | | | | | | | ~CHOGAN/hdf5:chogan/develop/10934_release_txt to develop * commit 'c000061e6a6123d9cba7938bb8e6b94139cc3cc7': Add RELEASE.txt entry for Jira 10934
| | * Add RELEASE.txt entry for Jira 10934Chris Hogan2019-12-091-0/+6
| | |
| * | Merge pull request #2031 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2019-12-0996-5021/+7278
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c087ef41b637686ae5e783bfb0a48e91dbe3f58e': (28 commits) Add H5Rdestroy calls to cleanup Remove problem tests for now Add new test reference HDFFV-10876 fix compare reference HDFFV-10876 ignore old reference API tests Add missing quotes Fix windows 10 compile error Correct indentation Revert declaration used in macro. Revert declaration deletion. HDFFV-10876 add note Address compile warnings Fix compile errors - mostly in jni HDFFV-10876 Update dump to match DDL spec Add extra line Adjust whitespace Update h5ls help and rework dump_mem routines for attrs Update create calls Add debug compile option as comment Update reference calls ...
| | * | Add H5Rdestroy calls to cleanupAllen Byrne2019-12-081-0/+3
| | | |
| | * | Remove problem tests for nowAllen Byrne2019-12-081-202/+102
| | | |
| | * | Add new test referenceAllen Byrne2019-12-081-0/+2
| | | |
| | * | HDFFV-10876 fix compare referenceAllen Byrne2019-12-081-2/+2
| | | |
| | * | HDFFV-10876 ignore old reference API testsAllen Byrne2019-12-073-40/+26
| | | |
| | * | Add missing quotesAllen Byrne2019-12-071-2/+2
| | | |
| | * | Fix windows 10 compile errorAllen Byrne2019-12-071-6/+18
| | | |
| | * | Correct indentationAllen Byrne2019-12-071-15/+15
| | | |
| | * | Revert declaration used in macro.Allen Byrne2019-12-071-0/+1
| | | |
| | * | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-12-074-6/+22
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * commit '9c3900d0bf05a65e59cce6dc613b38b240599d93': Add note to RELEASE.txt for H5Sselect_adjust. Add RELEASE.txt note for H5Sselect_project_interesection Minor tweaks noticed while going over VOL documentation.
| * | | Merge pull request #2082 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2019-12-063-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to develop * commit 'bbd4f7d2a0bea8f984868e2bf88dd1c5f5aa35e8': Minor tweaks noticed while going over VOL documentation.
| | * | | Minor tweaks noticed while going over VOL documentation.Dana Robinson2019-12-063-6/+6
| | | |/ | | |/|
| * | | Merge pull request #2098 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to ↵Neil Fortner2019-12-061-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit 'f6961c82bf3e7b848b071a0299dcc3753361e35d': Add note to RELEASE.txt for H5Sselect_adjust.
| | * | | Add note to RELEASE.txt for H5Sselect_adjust.Neil Fortner2019-12-061-0/+8
| |/ / /
| * | | Merge pull request #2093 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to ↵Neil Fortner2019-12-061-0/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit '411241bea660411b99925edc8040139443fe8a74': Add RELEASE.txt note for H5Sselect_project_interesection
| | * \ \ Merge branch 'develop' of ↵Neil Fortner2019-12-060-0/+0
| | |\ \ \ | | |/ / / | |/| | | | | | | | ssh://bitbucket.hdfgroup.org:7999/~nfortne2/hdf5_naf into develop
| | * | | Add RELEASE.txt note for H5Sselect_project_interesectionNeil Fortner2019-12-061-0/+8
| | | | |
| | | | * Revert declaration deletion.Allen Byrne2019-12-071-0/+1
| | | | |
| | | | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2019-12-061-0/+9
| | | | |\ | | |_|_|/ | |/| | | | | | | | | | | | | * commit 'fa31520e25ec27140f8d0dfec859aede163d2201': Add RELEASE.txt note for HVLget_file_type()
| * | | | Merge pull request #2090 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to ↵Neil Fortner2019-12-061-0/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit 'c7165f05444ce5ae6c5db50f2faf33023ba0eac0': Add RELEASE.txt note for HVLget_file_type()
| | * | | Add RELEASE.txt note for HVLget_file_type()Neil Fortner2019-12-061-0/+9
| |/ / /
| | | * HDFFV-10876 add noteAllen Byrne2019-12-061-0/+9
| | | |
| | | * Address compile warningsAllen Byrne2019-12-069-55/+33
| | | |