California State University has reached a tentative agreement with the California Faculty Association (CFA), resolving a year-long dispute over faculty salaries and averting planned strike activity next week by the CFA.