South African public sector strike ends