Commit Graph

5192 Commits

Author SHA1 Message Date
Ward Fisher
27ca221bdb Merge branch 'master' into appveyor.wif 2018-05-14 13:19:17 -06:00
Ed Hartnett
984f112580 test development 2018-05-14 10:06:35 -06:00
Ed Hartnett
868df56d8f fixed memory issue 2018-05-14 09:12:11 -06:00
Ed Hartnett
3051fd5313 merged memtest fix 2018-05-14 09:10:40 -06:00
Ed Hartnett
271abc6bcb added file 2018-05-14 08:49:13 -06:00
Ed Hartnett
fd23cb3cf2 cleanup makefile, develop test 2018-05-14 08:11:32 -06:00
Ed Hartnett
3a8c5fa254 merged memtest fix to get past CI 2018-05-13 07:56:41 -06:00
Ed Hartnett
2d0ef80cc4 added tests 2018-05-13 07:31:46 -06:00
Ed Hartnett
049f8fbdbf merged memtest fix to pass CI 2018-05-12 10:02:15 -06:00
Ed Hartnett
95f1d95615 now check return values of NC4_get_fileinfo() 2018-05-12 10:00:02 -06:00
Ed Hartnett
a34a71a569 now check return values of NC4_get_fileinfo() 2018-05-12 09:59:09 -06:00
Ed Hartnett
bc759bba58 added tests to confirm correct default chunksizes when fletcher32/shuffle are turned on 2018-05-12 09:48:13 -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
Ed Hartnett
f08800d7d2
Merge branch 'master' into ejh_hdf5_split_1 2018-05-10 17:15:40 -06:00
Ward Fisher
605a5bfb0b Merge branch 'master' into travis-tweak 2018-05-10 16:28:47 -06:00
Ward Fisher
7d6f1f827d Noticed a missing '-e' 2018-05-10 16:03:24 -06:00
Ward Fisher
7c582ea7e2 Noticed a missing '-e' 2018-05-10 15:57:56 -06:00
Ward Fisher
3ba5acec5c Attempt to fix travis failure. 2018-05-10 15:34:21 -06:00
Ward Fisher
d727a94f4d Explicitly turn off cp on ubuntu images. 2018-05-10 14:53:29 -06:00
Ward Fisher
09ed08ce56 Tighten up the travis script. 2018-05-09 15:27:31 -06:00
Ward Fisher
3f72d34159 Another tweak. 2018-05-09 14:50:50 -06:00
Ed Hartnett
af70577e6d merged master 2018-05-09 14:43:42 -06:00
Ward Fisher
f05d4d6399 Travis tweak. 2018-05-09 14:43:20 -06:00
Ed Hartnett
324bb137b9
Merge branch 'master' into ejh_fix_memtest 2018-05-09 14:37:21 -06:00
Ward Fisher
90f2ef5e21 Tweaking docker run_serial script to accomdate older versions of git packaged with centos and fedora, but without incurring the penalty for ubuntu and other distros which ship with a new git that can handle cloning a shallow copy. 2018-05-09 14:15:27 -06:00
Ward Fisher
7a81b55326
Merge pull request #956 from Unidata/pr-consolidate.wif
Consolidating Several PR's
2018-05-09 14:09:09 -06:00
Ed Hartnett
d090d57e3b changes 2018-05-09 04:48:47 -06:00
Ward Fisher
2bb209f9c5 Corrected typo. 2018-05-08 15:06:27 -06:00
Ward Fisher
eca1477a3e Corrected an issue with parallel builds. 2018-05-08 14:58:00 -06:00
Ed Hartnett
5072e634a4 temporary fix for parallel build problems 2018-05-08 14:43:04 -06:00
Ed Hartnett
51353ddc5e moved hdf5.h include 2018-05-08 13:57:03 -06:00
Ed Hartnett
a68f57a0e5 added missing files 2018-05-08 12:20:55 -06:00
Ed Hartnett
c402b79ed8 merged changes from master 2018-05-08 12:13:03 -06:00
Ed Hartnett
5526ca65d1 created libhdf5, moved some files 2018-05-08 11:58:01 -06:00
Ward Fisher
94cbded134 Merge branch 'ejh_fix_n3' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-consolidate.wif 2018-05-08 11:43:19 -06:00
Ed Hartnett
c175a302da fixed some issues 2018-05-08 11:39:37 -06:00
Ward Fisher
544c0994c9 Merge branch 'msvc-vs2013-support' of https://github.com/mathstuf/netcdf-c into pr-consolidate.wif 2018-05-08 11:12:19 -06:00
Ward Fisher
c0170a3eec Merge remote-tracking branch 'origin/sftlist.dmh' into pr-consolidate.wif 2018-05-08 11:12:07 -06:00
Ward Fisher
90122c317f Merge branch 'patch-21' of https://github.com/gsjaardema/netcdf-c into pr-consolidate.wif 2018-05-08 11:11:44 -06:00
Ward Fisher
0123000750
Merge pull request #879 from Unidata/inmemory.dmh
Expand the NC_INMEMORY capabilities
2018-05-07 13:17:36 -06:00
Greg Sjaardema
700262c5ab
Fix unused variable compiler warning
Fix unused variable warning for `printid`.   Looks like it was not substituted in all places where it should have been and was only used inside an ifdef so was unused if `LOGGING` was false.  Add use in `fprintf` line following the ifdef block.

Minor change, but compilation output is so clean that a little wart sticks out...
2018-05-07 08:56:19 -06:00
Dennis Heimbigner
23710400fe Update the netCDF-Extractor entry re: esupport QHB-286994 2018-05-05 12:36:24 -06:00
Ward Fisher
75a3e8997e Updated release notes to reference https://github.com/Unidata/netcdf-c/pull/879 2018-05-04 17:01:19 -06:00
Ward Fisher
9f716a228f
Merge branch 'master' into inmemory.dmh 2018-05-04 16:15:22 -06:00
Ward Fisher
723f243ee0
Merge branch 'master' into msvc-vs2013-support 2018-05-04 16:13:45 -06:00
Ward Fisher
cd3aa02b60
Merge pull request #938 from NetCDF-World-Domination-Council/ejh_move_tests
moved netcdf-4 tests from nc_test to nc_test4
2018-05-04 16:10:12 -06:00
Ward Fisher
369c7dd441
Merge branch 'master' into ejh_move_tests 2018-05-04 14:55:29 -06:00
Ward Fisher
101ae0fc88
Merge pull request #952 from Unidata/centos-fix.wif
Centos fix
2018-05-04 14:52:00 -06:00