4314 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ed Hartnett	a7165c0388	merging branches into develop	2017-11-15 11:34:06 -07:00
Ed Hartnett	fec47f43b6	merging branches into develop	2017-11-15 11:33:24 -07:00
Ed Hartnett	7a2d62afe4	merging branches into develop	2017-11-15 11:26:29 -07:00
Ed Hartnett	83c2395238	merging branches into develop	2017-11-15 11:25:42 -07:00
Ed Hartnett	d4845dbb38	merging branches into develop	2017-11-15 11:25:01 -07:00
Ed Hartnett	07de8e13f8	merging branches into develop	2017-11-15 11:24:10 -07:00
Ed Hartnett	ee3535a60f	merging branches into develop	2017-11-15 11:23:03 -07:00
Ed Hartnett	ed1c5a91b2	Merge branch 'master' into ejh_fix_test	2017-11-15 03:41:27 -07:00
Ed Hartnett	3b82328902	Merge branch 'master' into ejh_more_warnings	2017-11-15 03:41:12 -07:00
Ed Hartnett	2baf95e09d	Merge branch 'master' into ejh_turn_tests_on	2017-11-15 03:40:56 -07:00
Ed Hartnett	f4862e5fba	Merge branch 'master' into ejh_make_j_2	2017-11-15 03:40:31 -07:00
Ed Hartnett	92a995e521	Merge branch 'master' into ejh_large_file_test_3	2017-11-15 03:39:42 -07:00
Ed Hartnett	3d4548a0e4	Merge branch 'master' into ejh_ncdump_again	2017-11-15 03:39:21 -07:00
Ed Hartnett	1daae8df7b	Merge branch 'master' into ejh_nctest	2017-11-15 03:39:07 -07:00
Ward Fisher	f6828b4b5e	Merge pull request #649 from NetCDF-World-Domination-Council/ejh_new_mem_error ... BUGFIX: Fixes 3 memory leaks, in tst_filterparser.c, nc4internal.c, and dfilter.c	2017-11-14 11:31:49 -07:00
Ed Hartnett	a8d5323083	fixed leak in event of null paramter	2017-11-14 09:34:26 -07:00
Ed Hartnett	013151edc6	fixed leak relating to var->params	2017-11-14 09:15:13 -07:00
Ed Hartnett	0e58aa412d	fixed memory leak in tst_filterparser	2017-11-14 09:05:35 -07:00
Ed Hartnett	2d5883e8c3	Merge branch 'master' into ejh_ncdump_again	2017-11-14 07:42:19 -07:00
Ward Fisher	365afca7be	Replaced the overwritten updated parsefilterflag	2017-11-13 13:19:46 -07:00
Ward Fisher	efff646587	Quick test of something to resolve conflict in generated files.	2017-11-13 12:33:19 -07:00
Ward Fisher	16d6f94f30	Merge branch 'master' into filters.dmh	2017-11-13 11:15:02 -07:00
Ed Hartnett	b0ec55f6f0	fixed distcheck problem	2017-11-12 11:23:04 -07:00
Ed Hartnett	96baaa5c88	now nctest also tests CDF5 if it is built	2017-11-12 10:02:49 -07:00
Ed Hartnett	8d583f94a0	removed last use of EXTRA_TESTS, also unneeded setting for tst_h_rdc0.c	2017-11-12 06:57:37 -07:00
Ed Hartnett	83777626e0	working on cmake build	2017-11-12 06:21:31 -07:00
Ed Hartnett	add3e4b46d	working on cmake build	2017-11-12 06:12:08 -07:00
Ed Hartnett	84ed36c62c	working on cmake build	2017-11-12 05:43:59 -07:00
Ed Hartnett	e9df3fad55	working on cmake build	2017-11-12 05:42:24 -07:00
Ed Hartnett	4e52587864	fixed typo in CMakeLists.txt	2017-11-12 05:34:31 -07:00
Ed Hartnett	05d251bfb5	different attempt to deal with ncdump dependencies	2017-11-11 17:33:51 -07:00
Ed Hartnett	15b4dd9280	added file	2017-11-11 16:52:08 -07:00
Ed Hartnett	8df5c84f31	fixed makefile.am	2017-11-11 16:51:10 -07:00
Ed Hartnett	b17059e750	fixed makefile.am	2017-11-11 16:49:52 -07:00
Ed Hartnett	a80ac592cd	attempt at cmake files	2017-11-11 16:46:25 -07:00
Ed Hartnett	f709a7b107	another attempt at reducing ncdump dependencies	2017-11-11 16:45:03 -07:00
Ed Hartnett	cb32451cf5	turned on some commented out test code	2017-11-10 05:01:32 -07:00
Ed Hartnett	df31f07830	Merge branch 'master' into ejh_make_j_3	2017-11-10 02:53:07 -07:00
Ed Hartnett	ec07a2b147	Merge branch 'master' into ejh_make_j_2	2017-11-10 02:52:55 -07:00
Ed Hartnett	6d31b47543	Merge branch 'master' into ejh_more_warnings	2017-11-10 02:52:46 -07:00
Ed Hartnett	ca49633a64	Merge branch 'master' into ejh_fix_test	2017-11-10 02:43:32 -07:00
Ward Fisher	a9dde277d7	Merge branch 'ejh_enum_mem_fix' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls	2017-11-09 16:11:17 -07:00
Ward Fisher	2b749d3926	Merge branch 'ejh_delete_ncx' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls	2017-11-09 12:53:06 -07:00
Ward Fisher	d185602abf	Merge branch 'ejh_make_j' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls	2017-11-09 12:52:55 -07:00
Ward Fisher	41e1ead0e8	Merge branch 'ejh_v2_docs' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls	2017-11-09 12:52:48 -07:00
Ward Fisher	381badca6d	Merge branch 'ejh_fix_disable_utilities' of https://github.com/NetCDF-World-Domination-Council/netcdf-c into more_ejh_pulls	2017-11-09 12:52:40 -07:00
Ward Fisher	fde90d9e10	Updated requirements in install.md to clarify both 1.8.x branch and 1.10.x branch minimum versions.	2017-11-09 12:51:05 -07:00
Ed Hartnett	cfa773d29d	used cast to int instead of %ul printf format, because some compilers are a little out of step	2017-11-09 10:44:46 -07:00
Ed Hartnett	e792d992b1	fixed names of output files to enable parallel builds	2017-11-09 07:21:00 -07:00
Ed Hartnett	3807080886	noted dependancy between tests, allowing make check to work in parallel	2017-11-09 07:05:01 -07:00