Commit Graph

4819 Commits

Author SHA1 Message Date
Ward Fisher
74d9767ec0
Merge pull request #901 from Unidata/v4.6.1-release-branch.wif
V4.6.1 release branch.wif
2018-03-15 14:30:26 -06:00
Ward Fisher
6074ef0751 Merge branch 'dmh_merge_aggregate.wif' into v4.6.1-release-branch.wif 2018-03-15 11:42:44 -06:00
Ward Fisher
ede8f1b02e Bumping to post-4.6.1-release, for merge back into master. 2018-03-15 11:29:32 -06:00
Ward Fisher
a699d37816 Updated release notes. 2018-03-15 11:03:38 -06:00
Ward Fisher
44852d8d9d Merge remote-tracking branch 'origin/triplehost.dmh' into dmh_merge_aggregate.wif 2018-03-15 11:00:38 -06:00
Ward Fisher
620be6aee7 Merge remote-tracking branch 'origin/ncpyfilter.dmh' into dmh_merge_aggregate.wif 2018-03-15 11:00:19 -06:00
Ward Fisher
0b008fae62 Fencepost for unistd.h 2018-03-12 11:08:50 -06:00
Ward Fisher
6883bb279b
Merge branch 'master' into triplehost.dmh 2018-03-08 15:48:45 -07:00
Ward Fisher
1e0cf1136c
Merge branch 'master' into ncpyfilter.dmh 2018-03-08 15:48:40 -07:00
Ward Fisher
c86f5f01be Corrected typo. 2018-03-08 16:17:27 -05:00
Ward Fisher
f0df5fad56 Substituting wget for curl to see if that fixes the strange error we are seeing on travis. 2018-03-08 15:27:42 -05:00
Ward Fisher
f6a036619a
Merge pull request #895 from NetCDF-World-Domination-Council/ejh_hdf4_more
Move HDF4 tests to their own directory
2018-03-07 21:25:45 -07:00
Ward Fisher
9f801085f6
Merge branch 'master' into ncpyfilter.dmh 2018-03-07 13:04:39 -07:00
Dennis Heimbigner
6e5490b6d2
Merge branch 'master' into triplehost.dmh 2018-03-06 13:00:43 -07:00
Ward Fisher
e2e09a358b
Merge branch 'master' into ejh_hdf4_more 2018-03-05 13:02:20 -07:00
Ward Fisher
5e705e85b8
Merge pull request #632 from wkliao/big_var_on_32bit
large files on 32-bit machines
2018-03-05 10:26:14 -07:00
Ward Fisher
66fb19ab36
Merge branch 'master' into big_var_on_32bit 2018-03-05 09:35:23 -07:00
Ed Hartnett
016049e509 fixed makefile for hdf4_test 2018-03-05 05:53:41 -07:00
Ed Hartnett
a5713f7ac0 fixed cmake build for hdf4_tests 2018-03-05 05:38:00 -07:00
Ed Hartnett
4e646e03f6 fixed cmake build file 2018-03-05 05:03:46 -07:00
Ed Hartnett
a9457a6169 fixed cmake build file 2018-03-05 04:52:53 -07:00
Ed Hartnett
3e6661e1b1 fixed name 2018-03-05 04:22:15 -07:00
Ed Hartnett
a8af8d4cdf merged PR 888 2018-03-05 03:57:30 -07:00
Ed Hartnett
17f7a76356 moved HDF4 tests 2018-03-05 03:45:18 -07:00
Dennis Heimbigner
7b324657d4
Merge branch 'master' into ncpyfilter.dmh 2018-03-02 19:49:43 -07:00
Ward Fisher
04be884eb6
Merge pull request #893 from Unidata/pr-aggregation2.wif
Second Try: Aggregation of Pull Requests
2018-03-02 19:26:01 -07:00
Dennis Heimbigner
dd4e71c150 1. Solve issue raised on netcdfgroup mailing list:
https://www.unidata.ucar.edu/mailing_lists/archives/netcdfgroup/2018/msg00020.html
See docs/filters.md for a detailed description of the solution.
Basically we add nccopy flags "-F none" and "-F <varname>:none"
to suppress output compression as desired.

2. Add tests to nc_test4/tst_filter.sh to test out the solution.
2018-03-02 16:55:58 -07:00
Ward Fisher
faad52041f Merge branch 'ejh_valgrind_removal_unidata_again' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into pr-aggregation2.wif 2018-03-02 14:22:42 -07:00
Ward Fisher
63736532e2 Merge branch 'have-alloc-h-check' of https://github.com/mathstuf/netcdf-c into pr-aggregation2.wif 2018-03-02 14:22:27 -07:00
Ward Fisher
cec9bcd29c Merge branch 'classic_ext_ncid' of https://github.com/wkliao/netcdf-c into pr-aggregation2.wif 2018-03-02 14:22:16 -07:00
Ward Fisher
8280586c16 Merge branch 'tst_names' of https://github.com/wkliao/netcdf-c into pr-aggregation2.wif 2018-03-02 14:22:02 -07:00
Ward Fisher
d8f4f3ed6c
Merge pull request #889 from Unidata/gh843.wif
Revert change that broke extant NCO workflow
2018-02-28 15:34:30 -07:00
Ward Fisher
ffa36e69c9 Updated release notes. 2018-02-28 14:32:45 -07:00
Ward Fisher
61e9c1c9b1 Corrected typo in test. 2018-02-28 13:40:50 -07:00
Ward Fisher
03bffa1e11 Accomodate non-standard characters in build path in test_common.in 2018-02-28 12:54:53 -07:00
Ward Fisher
c4551856d4 Simplified fix. 2018-02-28 12:20:53 -07:00
Ward Fisher
3ccce81190 Accomodating special characters in path name. 2018-02-28 12:18:20 -07:00
Ward Fisher
faf1470887 Commented out the code, rather than just adding a comment block. 2018-02-27 15:20:58 -07:00
Ward Fisher
6ce110e362 Updated libsrc/attr.m4 in support of https://github.com/Unidata/netcdf-c/issues/843 2018-02-27 15:15:43 -07:00
Dennis Heimbigner
d0a10dbbac re: gh issue https://github.com/Unidata/netcdf-c/issues/887
Make sure that all attempts to access the rc file
triples check first for triple->host being null.
2018-02-27 14:22:04 -07:00
Ward Fisher
3dcb627ea1
Merge pull request #883 from Unidata/gh881-ac-par.wif
Gh881 ac par.wif
2018-02-27 12:13:19 -07:00
Ed Hartnett
49ebcc0e57 fixed problem of test file 2018-02-27 11:10:04 -07:00
Ed Hartnett
64e5742d88 added tst_bug324 to cmake build 2018-02-27 08:53:58 -07:00
Ed Hartnett
45329862a8 removed valgrind stuff 2018-02-27 08:36:12 -07:00
Ward Fisher
cebe81a742 Corrected logic error in cmake. 2018-02-26 17:16:15 -07:00
Ward Fisher
18c47417f7 Updated ac, cmake based builds to require parallel functionality when parallel tests are requested. 2018-02-26 17:08:26 -07:00
Ward Fisher
43b9c6302c Fix in support of https://github.com/Unidata/netcdf-c/issues/881 2018-02-26 12:56:10 -07:00
Ed Hartnett
a45b8c7b70 merged upstream master 2018-02-23 08:33:07 -07:00
Ward Fisher
a8faac9292
Merge branch 'master' into classic_ext_ncid 2018-02-22 17:15:34 -07:00
Ward Fisher
fc6ab9881f
Merge pull request #855 from Unidata/newhash0.dmh
Higher performance hash for metadata: step 0
2018-02-22 16:52:59 -07:00