summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1261 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-09-271-21/+14
|\ | | | | | | | | | | * commit 'a2da9930af38a86387466a2021b71a2cc7484f1b': replace page chars Remove obsolete comment
| * replace page charsAllen Byrne2018-09-271-3/+3
| |
| * Remove obsolete commentAllen Byrne2018-09-271-24/+17
|/
* Merge pull request #1258 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-09-262-0/+25
|\ | | | | | | | | | | | | | | * commit 'd26bb4d26ce5a23804a80c16dcb53e5f3eb957e4': HDFFV-10594 - mac must be space separated HDFFV-10594 - Add rpath configuration note Add extra path option for build location Use relative RPATH paths
| * HDFFV-10594 - mac must be space separatedAllen Byrne2018-09-261-1/+6
| |
| * HDFFV-10594 - Add rpath configuration noteAllen Byrne2018-09-261-0/+10
| |
| * Add extra path option for build locationAllen Byrne2018-09-261-2/+2
| |
| * Use relative RPATH pathsAllen Byrne2018-09-261-0/+10
|/
* Merge pull request #1257 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developLarry Knox2018-09-251-0/+5
|\ | | | | | | | | * commit '532a8df687e6acff18453fec6b8fe22f4bc65ebe': HDFFV-10531 document option for external libs
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-09-2572-3266/+3443
| |\ | |/ |/| | | | | * commit '8e3b094bad1706b444554cd23591fd1c4431c1f1': Remainder of vol_normalization changes (dataset, attribute, files, objects).
* | Merge pull request #1255 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to ↵Dana Robinson2018-09-2472-3266/+3443
|\ \ | | | | | | | | | | | | | | | | | | develop * commit '8a4695ed590809754794864d0473d15f8c1c69e3': Remainder of vol_normalization changes (dataset, attribute, files, objects).
| * \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Dana Robinson2018-09-2413-67/+163
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | * commit '2618dc314b9e4875e6ece7ee8696846ac2d02183': Remove extra unneeded Remove libsettings from pregenerated block CMake changes for SKIPPED and flush tests Correct $withval usage in configure HDFFV-10332 Adjust checks and generation of files HDFFV-10332 Use pre-generated files
| * | Merge branch 'develop' of ↵Dana Robinson2018-09-240-0/+0
| |\ \ | | | | | | | | | | | | https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop
| * | | Remainder of vol_normalization changes (dataset, attribute, files, objects).Dana Robinson2018-09-2472-3266/+3443
| | | |
| | | * HDFFV-10531 document option for external libsAllen Byrne2018-09-241-0/+5
| |_|/ |/| |
* | | Merge pull request #1246 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-09-243-41/+79
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96d5da7f1ad681573d42d2a4fd9e422fe049442d': Remove extra unneeded Remove libsettings from pregenerated block Correct $withval usage in configure HDFFV-10332 Adjust checks and generation of files HDFFV-10332 Use pre-generated files
| * \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-09-2461-1725/+1762
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | * commit 'e96bd2d46e208e0eb6c62cfcc4f86141f933884e': CMake changes for SKIPPED and flush tests H5S adjust callbacks now return an herr_t instead of void. Normalization with vol_integration (property lists, file drivers, other misc).
* | | | Merge pull request #1256 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to ↵Allen Byrne2018-09-2410-26/+84
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | develop * commit '8d7bdb704163327cacf8be3a4e03f02fb88a957b': CMake changes for SKIPPED and flush tests
| * | | CMake changes for SKIPPED and flush testsAllen Byrne2018-09-2410-26/+84
|/ / /
* | | Merge pull request #1254 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to ↵Dana Robinson2018-09-248-29/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | develop * commit '37309c1bd98b3d810f09569c72ac375e75117a91': H5S adjust callbacks now return an herr_t instead of void.
| * | Merge branch 'develop' of ↵Dana Robinson2018-09-240-0/+0
| |\ \ | |/ / |/| | | | | https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop
* | | Merge pull request #1253 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to ↵Dana Robinson2018-09-2443-1670/+1647
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop * commit '987bca5a34a09cd564445d53f58cf1e428e43276': Normalization with vol_integration (property lists, file drivers, other misc).
| | * | H5S adjust callbacks now return an herr_t instead of void.Dana Robinson2018-09-248-29/+31
| |/ /
| * | Merge branch 'develop' of ↵Dana Robinson2018-09-210-0/+0
| |\ \ | |/ / |/| | | | | https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop
| * | Normalization with vol_integration (property lists, file drivers,Dana Robinson2018-09-2143-1670/+1647
| | | | | | | | | | | | other misc).
| | * Remove extra unneededAllen Byrne2018-09-241-11/+7
| | |
| | * Remove libsettings from pregenerated blockAllen Byrne2018-09-241-40/+27
| | |
| | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-09-2449-1160/+1066
| | |\ | |_|/ |/| | | | | | | | * commit '5c99d4e4df67699b81f1323e27a4df935d90e465': Normalization with vol_integration (misc internal and datatype)
* | | Merge pull request #1252 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to ↵Dana Robinson2018-09-2149-1160/+1066
|\ \ \ | |/ / | | | | | | | | | | | | | | | develop * commit '1c8916ca0e9fe3447efe205094a2b5d3d5ccf8f6': Normalization with vol_integration (misc internal and datatype)
| * | Merge branch 'develop' of ↵Dana Robinson2018-09-209-18/+18
| |\ \ | |/ / |/| | | | | https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop
| * | Normalization with vol_integration (misc internal and datatype)Dana Robinson2018-09-2049-1160/+1066
| | |
| | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-09-2173-1676/+1645
| | |\ | |_|/ |/| | | | | | | | | | | * commit 'f03758613a6ec83e5ddd664590d162ccc888f13e': Snapshot version 1.11 release 2. Normalization with vol_integration (test code and H5Xtest.c)
* | | Merge pull request #1251 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to developAllen Byrne2018-09-209-18/+18
|\ \ \ | | | | | | | | | | | | | | | | * commit '04a2d68778bc978ac62b03b5b5bfa034e2ced7f7': Snapshot version 1.11 release 2.
| * \ \ Merge branch 'develop' of ↵hdftest2018-09-2065-1659/+1628
| |\ \ \ | |/ / / |/| | | | | | | ssh://bitbucket.hdfgroup.org:7999/~hdftest/hdf5_hft into develop
* | | | Merge pull request #1250 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to ↵Dana Robinson2018-09-2064-1658/+1627
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | develop * commit '67a126c7ba8825ffb193c930c7b8cae939b3446d': Normalization with vol_integration (test code and H5Xtest.c)
| * | | Normalization with vol_integration (test code and H5Xtest.c)Dana Robinson2018-09-2064-1658/+1627
|/ / /
| * | Snapshot version 1.11 release 2.hdftest2018-09-209-18/+18
| | |
| | * Correct $withval usage in configureAllen Byrne2018-09-201-9/+9
| | |
| | * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-09-201-1/+1
| | |\ | |_|/ |/| | | | | | | | * commit '99299e195b5294549b75b28321ae7f8d2c6f8644': Fix missed replacement
* | | Merge pull request #1248 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to ↵Allen Byrne2018-09-201-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | develop * commit 'b3ad9e1c0e3d70233518ee84bd68935f5adb3b89': Fix missed replacement
| * | Fix missed replacementAllen Byrne2018-09-201-1/+1
|/ /
| * Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2018-09-2033-1100/+1066
| |\ | |/ |/| | | | | | | | | | | | | * commit 'bbafe0debae9886988e4b7ec31bb8ef7292e43f9': Remove extra constant Fix typo Add Constants to all ERR STK checks Use constants for test comparisons Develop normalization with vol_integration. Mostly peripheral things like the tools and wrappers, with just enough core library code to support that.
* | Merge pull request #1247 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to ↵Allen Byrne2018-09-192-26/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * commit '59f36c5cdef1899742feb1c06ee09886e2d0a220': Remove extra constant Fix typo Add Constants to all ERR STK checks Use constants for test comparisons
| * | Remove extra constantAllen Byrne2018-09-191-4/+3
| | |
| * | Fix typoAllen Byrne2018-09-191-1/+1
| | |
| * | Add Constants to all ERR STK checksAllen Byrne2018-09-192-8/+12
| | |
| * | Use constants for test comparisonsAllen Byrne2018-09-192-23/+27
| | |
* | | Merge pull request #1245 in HDFFV/hdf5 from ↵Dana Robinson2018-09-1931-1074/+1033
|\ \ \ | |/ / |/| | | | | | | | | | | | | | ~DEROBINS/hdf5_der:develop_pull_request to develop * commit 'eb78fd88325d58a95c026129f1e2b4c7c50f621a': Develop normalization with vol_integration. Mostly peripheral things like the tools and wrappers, with just enough core library code to support that.
| * | Develop normalization with vol_integration.Dana Robinson2018-09-1931-1074/+1033
| | | | | | | | | | | | | | | Mostly peripheral things like the tools and wrappers, with just enough core library code to support that.
| | * HDFFV-10332 Adjust checks and generation of filesAllen Byrne2018-09-191-21/+52
| | |