City rescinds boil-water advisory