Commit Graph

4731 Commits

Author SHA1 Message Date
Ed Hartnett
ca5f314fc0 minor test cleanup 2018-02-16 09:00:15 -07:00
Ed Hartnett
b0a8d4ee30 fixed merge issue 2018-02-14 07:58:50 -07:00
Ed Hartnett
41eb0f26c1
Merge branch 'master' into ejh_extra_tests 2018-02-13 15:48:35 -07:00
Ward Fisher
8ebb2fff8b
Merge pull request #862 from Unidata/gh861.wif
Corrected overflow error in support of https://github.com/Unidata/net
2018-02-13 15:22:45 -07:00
Ed Hartnett
e5cbf259ba fixed string memory leak 2018-02-13 14:17:15 -07:00
Ed Hartnett
cb4722a0cf fix for memory problem in tst_vars2.c 2018-02-13 13:49:29 -07:00
Ward Fisher
878b107d36 Corrected overflow error in support of https://github.com/Unidata/netcdf-c/issues/861 2018-02-13 12:18:06 -07:00
Ed Hartnett
dd41680f90 added rename test 2018-02-12 10:13:31 -07:00
Ed Hartnett
dbbd5094cb added rename test to CMakeLists.txt 2018-02-12 10:12:49 -07:00
Ed Hartnett
32e2798dde added rename test 2018-02-12 10:08:59 -07:00
Ed Hartnett
70d815b6c8 pulled in some attribute testing that got missed in recent merges 2018-02-12 08:33:20 -07:00
Ed Hartnett
462a4db918 merged upstream/master 2018-02-12 08:09:39 -07:00
Ward Fisher
30163bcd34 Fix syntax for NC_EXTRA_DEPS 2018-02-09 12:57:11 -07:00
Ward Fisher
f3e44e3206
Merge pull request #854 from Unidata/cmake-hdf5-crt.wif
HDF5 ZLIB detection and CRT configuration
2018-02-09 11:44:11 -07:00
Ward Fisher
b20bc97a3c Updated release notes in support of https://github.com/Unidata/netcdf-c/pull/853 2018-02-08 12:55:45 -07:00
pedro-vicente
23b5e5bd8d changes to detect HDF5 HL, build with CRT and detect ZLIB in HDF5 2018-02-08 13:45:29 -05:00
Ed Hartnett
3ff753c147 merged upstream/master 2018-02-08 04:14:20 -07:00
Ward Fisher
712b13e396
Merge pull request #846 from Unidata/windows_mem_nc3.wif
Address a Windows NC3 Memory issue.
2018-02-07 14:51:47 -07:00
Ward Fisher
9e926410ee Added the fix suggested by @mathstuf in support of https://github.com/unidata/netcdf-c/issues/845 2018-02-07 11:23:54 -07:00
Ward Fisher
f9b7f1d452
Merge pull request #844 from Unidata/ejh_batch.wif
Batch EJH Pull requests
2018-02-07 11:15:38 -07:00
Ward Fisher
5107655682 Accomodate Visual Studio 2018-02-06 13:32:30 -06:00
Ward Fisher
39465fed12 Added include to config.h 2018-02-06 13:14:15 -06:00
Ward Fisher
a640c034f2 Merge branch 'ejh_atts_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:47:48 -07:00
Ward Fisher
e0577cb251 Merge branch 'ejh_fill_value_string_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:47:34 -07:00
Ward Fisher
9276fdaf9a Merge branch 'ejh_var_docs_only_unidata_2' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:43:52 -07:00
Ward Fisher
b268f268bd Merge branch 'ejh_dims_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-05 11:43:41 -07:00
Ed Hartnett
91fb82c6c5 merged changes from upstream/master 2018-02-05 09:23:54 -07:00
Ed Hartnett
0d96ead703
Merge branch 'master' into ejh_dims_unidata 2018-02-05 06:34:04 -07:00
Ward Fisher
b4a29470c0
Merge pull request #478 from wkliao/cdf5_var_len
CDF-5 fix: let NC_var.len be the true size of variable
2018-02-04 13:25:41 -07:00
Ed Hartnett
03cb35093c merged in upstream/master 2018-02-03 09:49:33 -07:00
Wei-keng Liao
be871248b9 disable CDF-5 feature when size_t is of size 4 bytes 2018-02-03 00:05:14 -06:00
Ward Fisher
f428660b69 Corrected typo in libnetcdf.settings.in when using autoconf. 2018-02-02 20:31:45 -07:00
Ward Fisher
d02a905aa9 Updated typo. 2018-02-02 20:27:06 -07:00
Ward Fisher
0fee3b9404 Added a missing line in config.h.cmake.in 2018-02-02 20:22:49 -07:00
Ward Fisher
c1d54b0213 Added check for genlib.h 2018-02-02 20:57:55 -06:00
Ward Fisher
c12fca453e Merge branch 'ejh_rename2_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-02 17:57:32 -07:00
Ward Fisher
7d59cf7165 Merge branch 'ejh_makefile_cleanup_unidata' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-02 17:57:21 -07:00
Ward Fisher
9b4b2308c6 Merge branch 'ejh_warnings' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into ejh_batch 2018-02-02 17:56:04 -07:00
Ward Fisher
0d420fcfbb
Merge branch 'master' into cdf5_var_len 2018-02-02 10:31:46 -07:00
Ward Fisher
8c6defe568
Merge pull request #731 from wkliao/nc3-per-var-fill-v2
a clean commit for #383
2018-02-02 10:12:36 -07:00
Ed Hartnett
3ba04ac337 updated year 2018-02-02 08:45:03 -07:00
Ed Hartnett
23af1a98e8 Makefile.am cleanup 2018-02-02 08:42:49 -07:00
Ward Fisher
27693ba4a3
Merge branch 'master' into nc3-per-var-fill-v2 2018-02-01 11:45:40 -07:00
Ward Fisher
aea36f6eb7
Merge pull request #833 from Unidata/gsjaardema-batch
Gsjaardema batch merge
2018-02-01 11:30:40 -07:00
Ed Hartnett
383a19161a fixed warnings 2018-02-01 07:36:34 -07:00
Ed Hartnett
fc6a8caa78
Merge pull request #2 from Unidata/master
sync
2018-02-01 07:27:28 -07:00
Ed Hartnett
69c899a529 removed results of other merges from nc4var.c 2018-02-01 05:28:24 -07:00
Ed Hartnett
2afe401f17 another rename fix 2018-02-01 05:10:57 -07:00
Ward Fisher
03446423f7 Merge branch 'patch-12' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:24:38 -07:00
Ward Fisher
1c1c06ff8d Merge branch 'patch-13' of https://github.com/gsjaardema/netcdf-c into gsjaardema-batch 2018-01-31 16:24:05 -07:00