summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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)
| | * Normalization with vol_integration (property lists, file drivers,Dana Robinson2018-09-2143-1670/+1647
| |/ | | | | | | other misc).
| * Merge branch 'develop' of ↵Dana Robinson2018-09-209-18/+18
| |\ | |/ |/| | | https://bitbucket.hdfgroup.org/scm/~derobins/hdf5_der into develop
* | 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)
| | * | Snapshot version 1.11 release 2.hdftest2018-09-209-18/+18
| | | |
| | | * Normalization with vol_integration (misc internal and datatype)Dana Robinson2018-09-2049-1160/+1066
| | |/ | |/|
| * | Normalization with vol_integration (test code and H5Xtest.c)Dana Robinson2018-09-2064-1658/+1627
|/ /
* | 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
|/
* 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.
* | Merge pull request #1244 in HDFFV/hdf5 from ↵Dana Robinson2018-09-1943-2156/+418
|\ \ | |/ | | | | | | | | | | ~DEROBINS/hdf5_der:develop_pull_request to develop * commit '680cf4d946fd10d50e0f7acdc5bc93f91037fb4f': Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions orginally intended to support the full SWMR feature.
| * Removed 'VOL' versions of FUNC_ENTER macros as well as empty functionsDana Robinson2018-09-1843-2156/+418
| | | | | | | | orginally intended to support the full SWMR feature.
* | Merge pull request #1243 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to ↵Allen Byrne2018-09-185-622/+525
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop * commit '6c78869c19a88edfd7b6a2a99a8fb8f5febf0b7a': Fix whitespace and exit status HDFFV-9059 take file as argument HDFFV-9059 Allow detect to take a file as an argument
| * | Fix whitespace and exit statusAllen Byrne2018-09-182-276/+227
| | |
| * | HDFFV-9059 take file as argumentAllen Byrne2018-09-181-2/+2
| | |
| * | HDFFV-9059 Allow detect to take a file as an argumentAllen Byrne2018-09-184-516/+468
| |/
* | Merge pull request #1241 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2018-09-181-21/+22
|\ \ | |/ |/| | | | | * commit 'dfa58496a1f8d667de72a11affe0f5a2e3ae4558': Update COPYING file with new HDF5 license.
| * Update COPYING file with new HDF5 license.Larry Knox2018-09-171-21/+22
|/
* Merge pull request #1233 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-09-104-52/+97
|\ | | | | | | | | | | * commit 'c9771263ae300a65f6f9ae518da766a314002bed': Minor text corrections HDFFV-10569 Add unsupported option notes to docs
| * Minor text correctionsAllen Byrne2018-09-052-3/+3
| |
| * HDFFV-10569 Add unsupported option notes to docsAllen Byrne2018-09-043-49/+94
|/
* Merge pull request #1232 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-09-015-20/+15
|\ | | | | | | | | | | | | | | | | | | * commit 'fddbbc158d170b4e3a7ffd663f9799fd7e01a6a0': HDFFV-10568 fix hdf5_java library dependency Remove another extra path var Move muti-config dir setting to root process Fix one more intermediate location Use different variable Cleanup and add intermediate dir for java
| * HDFFV-10568 fix hdf5_java library dependencyAllen Byrne2018-09-011-0/+9
| |
| * Remove another extra path varAllen Byrne2018-09-011-1/+1
| |
| * Move muti-config dir setting to root processAllen Byrne2018-09-015-7/+8
| |
| * Fix one more intermediate locationAllen Byrne2018-08-311-1/+1
| |
| * Use different variableAllen Byrne2018-08-314-4/+4
| |
| * Cleanup and add intermediate dir for javaAllen Byrne2018-08-318-22/+7
|/
* Merge pull request #1230 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developLarry Knox2018-08-311-1/+1
|\ | | | | | | | | * commit '67220d101fbea90eab1c5bda0af531d39829c170': Java must use shared libs to allow dlopen calls
| * Java must use shared libs to allow dlopen callsAllen Byrne2018-08-301-1/+1
|/
* Merge pull request #1229 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-08-301-3/+2
|\ | | | | | | | | | | * commit 'cd35778542c3c6e51ad334e6e4cf4be9f08bcaf8': Correct names Call new function
| * Correct namesAllen Byrne2018-08-301-3/+0
| |
| * Call new functionAllen Byrne2018-08-301-0/+2
| |
* | Merge pull request #1228 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to developLarry Knox2018-08-301-1/+1
|\ \ | |/ |/| | | | | * commit 'e6f8a55d8c42270efd7c870b7cee07b0d4ba7d08': Correct default API version for develop to 112.
| * Correct default API version for develop to 112.Larry Knox2018-08-301-1/+1
|/
* Merge pull request #1226 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2018-08-2824-2834/+2331
|\ | | | | | | | | | | * commit 'ff13ed67a9ce20e5f598bd46cd6dd544b5237e22': Fix typo HD prefix and whitespace
| * Fix typoAllen Byrne2018-08-281-1/+1
| |