include/core/Engine.h · 3b593642420692f17096b372c44d1262d2af2b8c · Podhorszki, Norbert / ADIOS2

7 years ago

Merge branch 'master' of https://github.com/ornladios/ADIOS2.git · 0554b01f

wfg authored 7 years ago

Fixed
Conflicts:
	include/engine/bp/BPFileReader.h
	source/core/Transport.cpp
	source/engine/bp/BPFileReader.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp     ---> Removed
	source/format/BP1Aggregator.cpp ---> Removed
	source/format/BP1Writer.cpp ---> Removed
	source/transport/file/FileDescriptor.cpp

0554b01f

History

Merge branch 'master' of https://github.com/ornladios/ADIOS2.git

wfg authored 7 years ago

Fixed
Conflicts:
	include/engine/bp/BPFileReader.h
	source/core/Transport.cpp
	source/engine/bp/BPFileReader.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp     ---> Removed
	source/format/BP1Aggregator.cpp ---> Removed
	source/format/BP1Writer.cpp ---> Removed
	source/transport/file/FileDescriptor.cpp

Code owners

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