Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop

Resolve conflicts:
Conflicts:
	test/Makefile.am

1 files changed, 10 insertions, 6 deletions

diff --git a/MANIFEST b/MANIFEST
index 1d8f586..a086a06 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -975,7 +975,6 @@
 ./test/dtypes.c
 ./test/dtransform.c
 ./test/earray.c
-./test/echo_vol.c
 ./test/efc.c
 ./test/enc_dec_plist.c
 ./test/enc_dec_plist_cross_platform.c
@@ -1023,6 +1022,7 @@
 ./test/gen_deflate.c
 ./test/gen_file_image.c
 ./test/gen_filespace.c
+./test/gen_filters.c
 ./test/gen_mergemsg.c
 ./test/gen_new_array.c
 ./test/gen_new_fill.c
@@ -1066,6 +1066,8 @@
 ./test/noencoder.h5
 ./test/none.h5
 ./test/ntypes.c
+./test/null_vol_connector.c
+./test/null_vol_connector.h
 ./test/ohdr.c
 ./test/objcopy.c
 ./test/page_buffer.c
@@ -1106,12 +1108,15 @@
 ./test/testerror.sh.in
 ./test/testlinks_env.sh.in
 ./test/test_filter_plugin.sh.in
+./test/test_filters_le.h5
+./test/test_filters_be.h5
 ./test/testflushrefresh.sh.in
 ./test/testframe.c
 ./test/testhdf5.c
 ./test/testhdf5.h
 ./test/testlibinfo.sh.in
 ./test/test_usecases.sh.in
+./test/test_vol_plugin.sh.in
 ./test/testmeta.c
 ./test/testswmr.sh.in
 ./test/testvdsswmr.sh.in
@@ -1153,16 +1158,14 @@
 ./test/use_common.c
 ./test/use_disable_mdc_flushes.c
 ./test/use.h
-./test/vfd.c
-./test/vol.c
-./test/test_filters_le.h5
-./test/test_filters_be.h5
-./test/gen_filters.c
 ./test/vds.c
 ./test/vds_swmr.h
 ./test/vds_swmr_gen.c
 ./test/vds_swmr_reader.c
 ./test/vds_swmr_writer.c
+./test/vfd.c
+./test/vol.c
+./test/vol_plugin.c
 
 ./test/testfiles/err_compat_1
 ./test/testfiles/err_compat_2
@@ -1293,6 +1296,7 @@
 ./testpar/t_span_tree.c
 ./testpar/t_init_term.c
 ./testpar/testpar.h
+./testpar/testpflush.sh.in
 ./testpar/testphdf5.c
 ./testpar/testphdf5.h