Ward Fisher
c2ff9f01a6
Revert a stale change included in the merge.
2018-04-17 14:10:37 -06:00
Ward Fisher
99be33303a
Resolving conflicts in support of https://github.com/Unidata/netcdf-c/pull/424
2018-04-17 14:03:52 -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
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
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
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
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
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
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
Ward Fisher
308a840358
Merge branch 'master' into index.dmh
2018-03-26 17:06:19 -06:00
Ward Fisher
0a9997d872
Merge remote-tracking branch 'origin/minor-update' into vsfix-ssize_t
2018-03-26 15:58:50 -06:00
Ward Fisher
ed6de1be89
Fixed an issue where ssize_t was being either incorrectly type-def'd, or double type-def'd
2018-03-26 15:35:48 -06:00
Ward Fisher
913b4a3961
Merge branch 'master' into index.dmh
2018-03-26 14:22:46 -06:00
Ward Fisher
7109a01ac7
Merge branch 'master' into minor-update
2018-03-26 14:08:17 -06:00
Ward Fisher
441353f34f
Merge pull request #907 from Unidata/ncdaptestsclean.dmh
...
The ncdap_tests were a mess, so I decided to clean them up
2018-03-26 14:08:00 -06:00
Ward Fisher
f460746a8b
Silenced warning in CMakeLists.txt
2018-03-26 11:53:31 -06:00
Dennis Heimbigner
1246dd189b
merge master
2018-03-20 21:50:58 -06:00
Dennis Heimbigner
e6e3583e30
Merge branch 'master' into ncdaptestsclean.dmh
2018-03-20 21:37:35 -06:00
Dennis Heimbigner
05d078a8b0
The ncdap_tests were a mess, so I decided to clean them up
...
to remove cruft and to remove unused site tests
and make the tests somewhat more understandable.
Also did a fix to libdispatch/dwinpath to convert
relative paths to absolute paths. This will, I hope,
take care of some windows path problems when using
$srcdir in shell scripts.
2018-03-20 21:31:31 -06:00
Ward Fisher
fe0d0ac28c
Merge pull request #878 from Unidata/newhash1.dmh
...
This is the second step in refactoring the libsrc4 code.
2018-03-20 21:26:36 -06:00
Ward Fisher
1c148a580b
Corrected double declaration.
2018-03-20 14:41:21 -06:00
Ward Fisher
36c4b7947d
Merge branch 'master' into newhash1.dmh
2018-03-20 11:20:14 -06:00
Ward Fisher
9e0e9c1f41
Merge branch 'master' into merge-4.6.1-upstream
2018-03-19 22:56:22 -06:00
Ward Fisher
b7c6618392
Updated release notes to reflect delay in pushing out new release.
2018-03-18 17:06:49 -06:00
Dennis Heimbigner
313c4ccdb7
fix to ftp problem
2018-03-17 20:26:28 -06:00
Dennis Heimbigner
dc8c08f939
forgot to add files to repo
2018-03-17 19:09:49 -06:00
