source/adios2/toolkit/transportman/dataman/DataMan.cpp · de7d5d201c1a13d59a175ac28c25f6a0076d9db6 · Podhorszki, Norbert / ADIOS2

7 years ago

Merge remote-tracking branch 'upstream/master' into bp1read · de7d5d20

William F Godoy authored 7 years ago

Conflicts:
	examples/hello/datamanReader/helloDataManReader.cpp
	source/adios2/engine/dataman/DataManReader.cpp
	source/adios2/toolkit/transport/wan/WANZmq.cpp
	source/adios2/toolkit/transportman/dataman/DataMan.cpp

de7d5d20

History

Merge remote-tracking branch 'upstream/master' into bp1read

William F Godoy authored 7 years ago

Conflicts:
	examples/hello/datamanReader/helloDataManReader.cpp
	source/adios2/engine/dataman/DataManReader.cpp
	source/adios2/toolkit/transport/wan/WANZmq.cpp
	source/adios2/toolkit/transportman/dataman/DataMan.cpp

Code owners

Assign users and groups as approvers for specific file changes. Learn more.