Ed Hartnett
f2cb4678ee
moving HDF5 functions to libhdf5
2018-05-24 14:27:16 -06:00
Ward Fisher
491b96066c
Merge pull request #980 from NetCDF-World-Domination-Council/ejh_hdf5_2
...
more progress towards separating HDF5 code from libsrc4 code
2018-05-24 13:13:27 -06:00
Ed Hartnett
59f9a0c4f0
Merge branch 'master' into ejh_hdf5_2
2018-05-22 07:19:23 -06:00
Ward Fisher
2a9eaffd67
Merge pull request #619 from Unidata/dapparams.dmh
...
Alias stringlength url parameter and maxstrlen
2018-05-21 13:36:29 -06:00
Dennis Heimbigner
02bd33f250
Merge branch 'dapparams.dmh' of https://github.com/Unidata/netcdf-c into dapparams.dmh
2018-05-19 16:11:24 -06:00
Dennis Heimbigner
5fc6be9472
Code duplicated; merge failure?
2018-05-18 20:28:51 -06:00
Ed Hartnett
e4bed351c3
Merge branch 'master' into ejh_hdf5_2
2018-05-18 17:15:25 -06:00
Ward Fisher
30d41fa44a
Merge branch 'master' into dapparams.dmh
2018-05-18 14:27:55 -06:00
Ed Hartnett
fb6d19c3bb
Merge branch 'master' into ejh_hdf5_2
2018-05-18 05:32:09 -06:00
Ward Fisher
61a6c0c183
Merge branch 'master' into cleanncgen.dmh
2018-05-17 12:41:03 -06:00
Ward Fisher
5bd8992ff6
Merge pull request #988 from NetCDF-World-Domination-Council/ejh_clean
...
removed unused function
2018-05-17 12:40:41 -06:00
Ed Hartnett
7552e1588e
Merge branch 'master' into ejh_clean
2018-05-17 04:24:38 -06:00
Ed Hartnett
c8f6aa7d66
Merge branch 'master' into ejh_hdf5_2
2018-05-16 16:22:37 -06:00
Ward Fisher
6f844e8f5e
Merge pull request #992 from Unidata/small-pr-aggregate.wif
...
Small aggregation of PRs
2018-05-16 16:00:44 -06:00
Ward Fisher
ebe6633006
Merge branch 'master' into dapparams.dmh
2018-05-16 14:34:28 -06:00
Ward Fisher
a8c4c0aa68
Merge remote-tracking branch 'origin/cleanncgen.dmh' into small-pr-aggregate.wif
2018-05-16 14:32:10 -06:00
Ward Fisher
c9d1589c39
Merge branch 'master' into cleanncgen.dmh
2018-05-16 14:31:11 -06:00
Ward Fisher
9c13f3ff8b
Merge branch 'ejh_fix_memtest' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into small-pr-aggregate.wif
2018-05-16 14:27:45 -06:00
Ward Fisher
3f83cc4926
Merge branch 'master' into inmem2.dmh
2018-05-16 14:24:19 -06:00
Ed Hartnett
978fc99f3f
fixed indentation
2018-05-16 08:35:32 -06:00
Ed Hartnett
2ff0e14765
removed unused function
2018-05-16 08:31:23 -06:00
Ward Fisher
59b1efa9de
Merge branch 'master' into ejh_fix_memtest
2018-05-15 17:57:33 -06:00
Ward Fisher
72978f5f7e
Merge branch 'master' into ejh_hdf5_2
2018-05-15 17:56:46 -06:00
Ward Fisher
5d8b272a4f
Merge pull request #984 from Unidata/appveyor-exclude.wif
...
Testing Appveyor branch exclusion syntax.
2018-05-15 17:56:32 -06:00
Ward Fisher
2623599fd4
Merge branch 'master' into ejh_fix_memtest
2018-05-15 17:38:00 -06:00
Ward Fisher
c7208eee71
Added text somehow missing from the following pull request: https://github.com/Unidata/netcdf-c/pull/620
2018-05-15 17:20:24 -06:00
Ward Fisher
3f39624169
Typo.
2018-05-15 13:52:49 -06:00
Ward Fisher
b4e1971bf2
Taking a stab at excluding .wif and .dmh branches in appveyor, similar to how they are treated by travis.
2018-05-15 13:51:42 -06:00
Ward Fisher
75bdac654d
Merge branch 'master' into ejh_hdf5_2
2018-05-15 13:45:05 -06:00
Ward Fisher
019a10daf6
Merge pull request #983 from Unidata/appveyor.wif
...
Adding Appveyor Support
2018-05-15 13:43:27 -06:00
Ward Fisher
0ef7acaa64
Bumped maxcpucount
2018-05-15 12:59:17 -06:00
Ward Fisher
d52d7ecbe3
Turning off tests since we are not actually running them.
2018-05-15 12:26:20 -06:00
Ward Fisher
467d2ed981
Merge branch 'master' into ejh_hdf5_2
2018-05-15 12:23:32 -06:00
Ward Fisher
23abe014c0
Threads doesn't need to be required.
2018-05-15 12:19:33 -06:00
Ward Fisher
05d0b282bd
Trying an earlier version of hdf5 with appveyor.
2018-05-15 12:16:19 -06:00
Ward Fisher
d54e133e8d
Merge branch 'master' into appveyor.wif
2018-05-15 12:01:54 -06:00
Ed Hartnett
2e181fbb88
fixed cmake build
2018-05-15 07:12:56 -06:00
Ed Hartnett
d7f7c1465b
merged ininmem2 branch to pass CI
2018-05-15 06:53:28 -06:00
Ed Hartnett
8e7a617c98
added files
2018-05-15 06:51:44 -06:00
Ed Hartnett
3e320a5bfb
moved more HDF5 functions to libhdf5
2018-05-15 06:47:52 -06:00
Ed Hartnett
5adc066d47
merge in some fixes to pass CI
2018-05-15 06:28:55 -06:00
Ed Hartnett
0eb57ff25e
Merge branch 'master' into ejh_fix_memtest
2018-05-14 14:49:04 -06:00
Ward Fisher
b6e5ea6c72
Merge branch 'master' into vs15-fix
2018-05-14 14:46:10 -06:00
Ward Fisher
f14ab2e606
Merge pull request #958 from NetCDF-World-Domination-Council/ejh_hdf5_split_1
...
created libhdf5, moved some files
2018-05-14 14:45:16 -06:00
Ward Fisher
9bea284949
Fixed a shell script error on vs15
2018-05-14 14:37:07 -06:00
Ward Fisher
71be30a50e
Running tests will be good, but for now just check if netCDF builds on Windows.
2018-05-14 13:20:22 -06:00
Ward Fisher
27ca221bdb
Merge branch 'master' into appveyor.wif
2018-05-14 13:19:17 -06:00
Dennis Heimbigner
3c7ffcc6d1
Fix https://github.com/Unidata/netcdf-c/issues/963
...
Fix https://github.com/Unidata/netcdf-c/issues/962
1. remove the --disable-diskless option since it is no
longer needed. Similarly for CMakeLists.txt.
2. Fixed nc4files.c where BAIL and return were mixed
leading to situation where cleanup code was not
being invoked. This probably occurs elsewhere,
but I did not find any specifically.
2018-05-11 15:30:19 -06:00
Ed Hartnett
e6cd9a1629
removed changed for nc4file.c
2018-05-10 17:20:39 -06:00
Ed Hartnett
1c7ab547c6
Merge branch 'master' into ejh_fix_memtest
2018-05-10 17:16:34 -06:00
