mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,113 Commits 91 Branches 74 Tags 86 MiB
2a9eaffd67
Commit Graph

5113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ward Fisher
2a9eaffd67
Merge pull request #619 from Unidata/dapparams.dmh 
Alias stringlength url parameter and maxstrlen
 2018-05-21 13:36:29 -06:00
Dennis Heimbigner
02bd33f250 Merge branch 'dapparams.dmh' of https://github.com/Unidata/netcdf-c into dapparams.dmh 2018-05-19 16:11:24 -06:00
Dennis Heimbigner
5fc6be9472 Code duplicated; merge failure? 2018-05-18 20:28:51 -06:00
Ward Fisher
30d41fa44a
Merge branch 'master' into dapparams.dmh 2018-05-18 14:27:55 -06:00
Ward Fisher
61a6c0c183
Merge branch 'master' into cleanncgen.dmh 2018-05-17 12:41:03 -06:00
Ward Fisher
5bd8992ff6
Merge pull request #988 from NetCDF-World-Domination-Council/ejh_clean 
removed unused function
 2018-05-17 12:40:41 -06:00
Ed Hartnett
7552e1588e
Merge branch 'master' into ejh_clean 2018-05-17 04:24:38 -06:00
Ward Fisher
6f844e8f5e
Merge pull request #992 from Unidata/small-pr-aggregate.wif 
Small aggregation of PRs
 2018-05-16 16:00:44 -06:00
Ward Fisher
ebe6633006
Merge branch 'master' into dapparams.dmh 2018-05-16 14:34:28 -06:00
Ward Fisher
a8c4c0aa68 Merge remote-tracking branch 'origin/cleanncgen.dmh' into small-pr-aggregate.wif 2018-05-16 14:32:10 -06:00
Ward Fisher
c9d1589c39
Merge branch 'master' into cleanncgen.dmh 2018-05-16 14:31:11 -06:00
Ward Fisher
9c13f3ff8b Merge branch 'ejh_fix_memtest' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into small-pr-aggregate.wif 2018-05-16 14:27:45 -06:00
Ward Fisher
3f83cc4926 Merge branch 'master' into inmem2.dmh 2018-05-16 14:24:19 -06:00
Ed Hartnett
978fc99f3f fixed indentation 2018-05-16 08:35:32 -06:00
Ed Hartnett
2ff0e14765 removed unused function 2018-05-16 08:31:23 -06:00
Ward Fisher
59b1efa9de
Merge branch 'master' into ejh_fix_memtest 2018-05-15 17:57:33 -06:00
Ward Fisher
5d8b272a4f
Merge pull request #984 from Unidata/appveyor-exclude.wif 
Testing Appveyor branch exclusion syntax.
 2018-05-15 17:56:32 -06:00
Ward Fisher
2623599fd4
Merge branch 'master' into ejh_fix_memtest 2018-05-15 17:38:00 -06:00
Ward Fisher
c7208eee71 Added text somehow missing from the following pull request: https://github.com/Unidata/netcdf-c/pull/620 2018-05-15 17:20:24 -06:00
Ward Fisher
3f39624169 Typo. 2018-05-15 13:52:49 -06:00
Ward Fisher
b4e1971bf2 Taking a stab at excluding .wif and .dmh branches in appveyor, similar to how they are treated by travis. 2018-05-15 13:51:42 -06:00
Ward Fisher
019a10daf6
Merge pull request #983 from Unidata/appveyor.wif 
Adding Appveyor Support
 2018-05-15 13:43:27 -06:00
Ward Fisher
0ef7acaa64 Bumped maxcpucount 2018-05-15 12:59:17 -06:00
Ward Fisher
d52d7ecbe3 Turning off tests since we are not actually running them. 2018-05-15 12:26:20 -06:00
Ward Fisher
23abe014c0 Threads doesn't need to be required. 2018-05-15 12:19:33 -06:00
Ward Fisher
05d0b282bd Trying an earlier version of hdf5 with appveyor. 2018-05-15 12:16:19 -06:00
Ward Fisher
d54e133e8d Merge branch 'master' into appveyor.wif 2018-05-15 12:01:54 -06:00
Ed Hartnett
0eb57ff25e
Merge branch 'master' into ejh_fix_memtest 2018-05-14 14:49:04 -06:00
Ward Fisher
b6e5ea6c72 Merge branch 'master' into vs15-fix 2018-05-14 14:46:10 -06:00
Ward Fisher
f14ab2e606
Merge pull request #958 from NetCDF-World-Domination-Council/ejh_hdf5_split_1 
created libhdf5, moved some files
 2018-05-14 14:45:16 -06:00
Ward Fisher
9bea284949 Fixed a shell script error on vs15 2018-05-14 14:37:07 -06:00
Ward Fisher
71be30a50e Running tests will be good, but for now just check if netCDF builds on Windows. 2018-05-14 13:20:22 -06:00
Ward Fisher
27ca221bdb Merge branch 'master' into appveyor.wif 2018-05-14 13:19:17 -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