5313 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ed Hartnett	e28405744c	merged master	2018-06-25 17:08:22 -06:00
Ed Hartnett	4ddaa5d140	merged upstream master	2018-06-22 07:12:23 -06:00
Ward Fisher	601958b370	Merge pull request #969 from NetCDF-World-Domination-Council/ejh_logging ... After this PR, nc_set_log_level() will always be defined	2018-06-21 15:50:29 -06:00
Ed Hartnett	9bd28ea2bd	merged upgream master	2018-06-21 06:26:53 -06:00
Ward Fisher	a175695202	Merge branch 'master' into ejh_logging	2018-06-20 14:08:04 -06:00
Ward Fisher	c4bf9585fe	Merge pull request #967 from NetCDF-World-Domination-Council/ejh_streq ... changed macro STREQ to NCSTREQ to avoid name collusion with HDF4 library	2018-06-20 14:07:35 -06:00
Ed Hartnett	5ebb30b139	Merge branch 'master' into ejh_streq	2018-06-15 07:22:53 -06:00
Ed Hartnett	2ca8526278	merged master	2018-06-14 16:57:38 -06:00
Ed Hartnett	4763a6b831	merged upstream master	2018-06-14 16:55:34 -06:00
Ward Fisher	8de0b3cf3c	Merge pull request #974 from NetCDF-World-Domination-Council/ejh_more_testing ... added filter/szip tests	2018-06-14 15:30:31 -06:00
Ward Fisher	01ba5decf1	Merge branch 'master' into ejh_more_testing	2018-06-14 13:31:38 -06:00
Ward Fisher	aeb0e90b0b	When large file tests are enabled, this test fails in Docker. Fixed by switching from sh to bash.	2018-06-14 12:46:39 -06:00
Ed Hartnett	828fa3e0a5	changes to tst_varsperf to remove asserts	2018-06-12 07:30:49 -06:00
Ed Hartnett	97a580eda7	fixed documentation merge	2018-06-12 07:01:50 -06:00
Ed Hartnett	fb570522bc	merged in ejh_fix_user_type	2018-06-12 06:49:40 -06:00
Ed Hartnett	c3dcb5796a	merged upstream/master	2018-06-12 06:32:19 -06:00
Ed Hartnett	752030f59a	merged ejh_test_exten_unlim_no_coord	2018-06-12 06:22:26 -06:00
Ed Hartnett	9e5924ebb4	Merge branch 'master' into ejh_more_testing	2018-06-11 15:58:36 -06:00
Ed Hartnett	7984eee043	Merge branch 'master' into ejh_streq	2018-06-11 15:50:22 -06:00
Ward Fisher	e82bf82557	Merge pull request #977 from NetCDF-World-Domination-Council/ejh_udf ... user defined formats	2018-06-11 13:43:09 -06:00
Ed Hartnett	12db5e22f3	added test of extending unlimited dim with no coord var	2018-06-11 06:17:52 -06:00
Ed Hartnett	8c879b7d2b	removed unwanted ifdefs	2018-06-09 19:01:47 -06:00
Ed Hartnett	037a3cb58c	reverting	2018-06-09 06:17:52 -06:00
Ed Hartnett	09366bf43b	removed longs from conver_type again	2018-06-09 06:14:14 -06:00
Ward Fisher	5fe7d0ffad	Merge branch 'master' into ejh_udf	2018-06-08 16:52:20 -06:00
Ward Fisher	b84afc7409	Merge pull request #1001 from Unidata/vars.dmh ... Re-implement the nc_get/put_vars operations for netcdf-4 using the corresponding HDF5 operations.	2018-06-08 16:50:45 -06:00
Ward Fisher	1d789d9d39	Additional reconciliation	2018-06-08 15:50:39 -06:00
Ward Fisher	df4942d280	Merge branch 'master' into vars.dmh	2018-06-08 15:50:28 -06:00
Ed Hartnett	29ce3b7d8c	Merge branch 'master' into ejh_udf	2018-06-08 14:49:15 -06:00
Ward Fisher	601c65e7ae	Merge pull request #1015 from Unidata/misc-changes.wif ... Misc changes	2018-06-08 14:31:33 -06:00
Ward Fisher	4fba5dfb45	Squaed a potential memory leak.	2018-06-08 12:08:33 -06:00
Ward Fisher	335f25e947	Corrected a couple of potential memory related issues and an uninitialized variable issue.	2018-06-08 11:38:11 -06:00
Ward Fisher	595f39ce42	Corrected an unlikely but possible passage of a null pointer to memcpy.	2018-06-08 11:18:08 -06:00
Ed Hartnett	c1106c5f18	szip may not be present	2018-06-08 04:46:33 -06:00
Ed Hartnett	a721f91d45	merged master	2018-06-08 04:44:44 -06:00
Ed Hartnett	9e2feff848	more documentation	2018-06-08 04:39:38 -06:00
Ed Hartnett	03d1a7c7cc	Merge branch 'master' into ejh_logging	2018-06-08 03:17:01 -06:00
Ed Hartnett	a79ccdc908	Merge branch 'master' into ejh_streq	2018-06-08 03:15:47 -06:00
Ed Hartnett	f042d52a64	more documentation	2018-06-08 03:10:24 -06:00
Ed Hartnett	367d7c2a57	merged master	2018-06-07 18:36:25 -06:00
Ward Fisher	32b8ffbee9	Merge branch 'master' into misc-changes.wif	2018-06-07 16:17:54 -06:00
Ward Fisher	1af8b8f8fc	Corrected a stored value that's never read issue detected by static analysis.	2018-06-07 16:17:32 -06:00
Ward Fisher	bb65fe5ea5	More potential memory leaks squashed.	2018-06-07 15:58:47 -06:00
Ward Fisher	3cce9e99e2	Corrected several potential null dereference or memory leak issues detected by static analysis.	2018-06-07 15:21:42 -06:00
Ward Fisher	eca9cdb7ee	Merge pull request #1013 from NetCDF-World-Domination-Council/ejh_long_2 ... removed dead code associated with old handling of NC_LONG, fixed test checking NC_ELATEFILL	2018-06-07 13:13:45 -06:00
Ward Fisher	e1ed2531d7	Merge branch 'master' into misc-changes.wif	2018-06-07 11:23:32 -06:00
Ed Hartnett	eb6ed1d91c	more documentation	2018-06-07 08:41:00 -06:00
Ed Hartnett	5112ef8c72	merged master	2018-06-07 07:27:47 -06:00
Ed Hartnett	7aa073eb5d	magic numbers working with user-defined formats	2018-06-07 06:49:16 -06:00
Ed Hartnett	5521e062a4	more udf test	2018-06-06 13:17:32 -06:00