Ward Fisher
99be33303a
Resolving conflicts in support of https://github.com/Unidata/netcdf-c/pull/424
2018-04-17 14:03:52 -06:00
Ed Hartnett
5239c43adb
Merge branch 'master' into ejh_fill_test
2018-04-17 13:47:13 -06:00
Ward Fisher
e257649535
Merge branch 'master' into inmemory.dmh
2018-04-17 11:11:14 -06:00
Ward Fisher
4e27a01f30
Merge pull request #898 from NetCDF-World-Domination-Council/ejh_cleanup
...
Removed some unused files and unused m4 macros from acinclude.m4
2018-04-17 11:10:42 -06:00
Ward Fisher
c84d58122b
Merge branch 'master' into inmemory.dmh
2018-04-16 17:11:31 -06:00
Ed Hartnett
48c92cbdc3
Merge branch 'master' into ejh_fill_test
2018-04-16 16:35:09 -06:00
Ward Fisher
af36e53d21
Merge branch 'master' into ejh_cleanup
2018-04-16 16:05:49 -06:00
Ward Fisher
9ad46d7692
Merge pull request #922 from NetCDF-World-Domination-Council/ejh_hdf4_again
...
added merged HDF4 changes
2018-04-16 16:05:34 -06:00
Dennis Heimbigner
d38fc3e3d5
Merge branch 'inmemory.dmh' of https://github.com/Unidata/netcdf-c into inmemory.dmh
2018-04-14 12:02:18 -06:00
Dennis Heimbigner
c66f1d53bb
missing file
2018-04-14 12:01:52 -06:00
Ward Fisher
14903ac981
Removed a reference to a non-existant file.
2018-04-13 14:37:40 -06:00
Dennis Heimbigner
30860ce48f
fix makefile/cmakelist extra-dist problems
2018-04-13 13:27:43 -06:00
Dennis Heimbigner
4739cd3225
Master merge and conflict resolution
2018-04-12 21:51:17 -06:00
Ward Fisher
5ff3bb34ca
Merge branch 'master' into msvc-vs2013-support
2018-04-12 15:57:30 -05:00
Ed Hartnett
efe2bd116f
Merge branch 'master' into ejh_cleanup
2018-04-05 05:45:54 -06:00
Ed Hartnett
96154d9303
added merged HDF4 changes
2018-04-04 14:11:44 -06:00
Ward Fisher
9ba39124bd
Merge pull request #903 from Unidata/index.dmh
...
Final refactoring of libsrc4.
2018-04-04 10:29:19 -06:00
Dennis Heimbigner
5d48ab0678
Merge branch 'master' into dapparams.dmh
2018-04-03 13:15:55 -06:00
Ward Fisher
e2e2c2117f
Merge branch 'master' into index.dmh
2018-04-02 18:13:34 -06:00
Ward Fisher
3447004c84
Merge branch 'master' into ejh_cleanup
2018-04-02 18:11:58 -06:00
Ward Fisher
bdffa3cc17
Merge pull request #910 from NetCDF-World-Domination-Council/ejh_valgrind_3
...
new method of using valgrind
2018-04-02 17:27:58 -06:00
Ward Fisher
dad2101a04
Merge branch 'master' into index.dmh
2018-04-02 13:56:00 -06:00
Ward Fisher
a13b722af9
Merge branch 'master' into dapparams.dmh
2018-04-02 13:55:02 -06:00
Dennis Heimbigner
a4d865b004
The file libdispatch/crc32.c was apparently causing
...
name symbol conflicts with some versions of libz.
So, make all the functions in crc32.c be static
except for the single externally accessible NC_crc32
function.
2018-04-02 13:19:58 -06:00
Dennis Heimbigner
fd089ab3d2
Oops, forgot to remove nc4xinternal from Makefile.am
2018-03-31 11:56:12 -06:00
Dennis Heimbigner
ce1485d5f8
remove unneeded file
2018-03-31 11:37:21 -06:00
Ed Hartnett
d62d0464b6
Merge branch 'master' into ejh_cleanup
2018-03-30 18:51:44 -06:00
Ed Hartnett
bf3757c2d6
Merge branch 'master' into ejh_valgrind_3
2018-03-30 18:48:37 -06:00
Ed Hartnett
caea514ec7
Merge branch 'master' into ejh_fill_test
2018-03-30 18:48:20 -06:00
Ed Hartnett
9b16ec96c1
removed duplicate docs
2018-03-30 14:13:42 -06:00
Ward Fisher
8b97f22eef
Merge pull request #918 from Unidata/gethdf4.dmh
...
Attempt to fix the problem of ftp failing when getting the hdf4 from our ftp site.
2018-03-30 12:28:53 -06:00
Ed Hartnett
1546b4a91f
added documentation of attribute reserved names to user guide
2018-03-30 11:57:26 -06:00
Ed Hartnett
168340a8b6
added test for utf8 normalization for variable rename
2018-03-30 11:26:47 -06:00
Ed Hartnett
0e454a75c2
added fill mode test
2018-03-30 10:20:33 -06:00
Dennis Heimbigner
dab4a21656
Merge branch 'gethdf4.dmh' of https://github.com/Unidata/netcdf-c into gethdf4.dmh
2018-03-29 18:58:34 -06:00
Ward Fisher
e7a16a19a6
Modified tst_remote3.sh to work on OSX.
2018-03-29 18:30:16 -06:00
Dennis Heimbigner
cdd6e00434
Try to fix file copy from nc_test4/hdf5plugins
2018-03-29 18:29:31 -06:00
Dennis Heimbigner
20200eef7f
Update run_get_hdf4_files.sh
...
Up number of retries to 4
2018-03-29 16:37:18 -06:00
Dennis Heimbigner
a747cc32ce
Attempt to fix the problem of ftp failing
...
when getting the hdf4 from our ftp site.
Solution used here is to repeat the request
and to use the wget -c flag so we do not
start over on every retry.
2018-03-29 16:30:58 -06:00
Dennis Heimbigner
42e8028726
Re: github issues
...
https://github.com/Unidata/netcdf-c/issues/917
https://github.com/Unidata/netcdf-c/issues/915
Fix following memory errors:
1. global_buffer_overflow
2. nc4_att_list_add
2018-03-29 14:57:40 -06:00
Dennis Heimbigner
8cf597c8fb
Merge branch 'master' into index.dmh
2018-03-29 14:47:58 -06:00
Ward Fisher
595b1abb2e
Merge pull request #912 from NetCDF-World-Domination-Council/ejh_valgrind_0328
...
fixed spaces
2018-03-29 00:24:19 -06:00
Ed Hartnett
4652d9c3df
fixed spaces
2018-03-28 18:04:24 -06:00
Ed Hartnett
055edb73d9
Merge branch 'master' into ejh_valgrind_3
2018-03-28 14:37:48 -06:00
Ed Hartnett
d5bbf89942
new method of using valgrind
2018-03-28 14:00:26 -06:00
Ed Hartnett
af79dfa14d
new method of using valgrind
2018-03-28 13:54:05 -06:00
Dennis Heimbigner
eace0e922e
Fixed case when --enable-parallel is true
2018-03-28 13:41:26 -06:00
Ward Fisher
28082c283b
Merge branch 'master' into index.dmh
2018-03-26 23:47:43 -06:00
Ward Fisher
859da9b09f
Merge pull request #904 from Unidata/issue899.dmh
...
Fix bug: Index exceeds dimension bound
2018-03-26 23:21:06 -06:00
Ward Fisher
7b86b4d3d3
Merge branch 'master' into issue899.dmh
2018-03-26 22:31:29 -06:00
