Fixing CHANGES.txt for YARN-758 as it is now merged into branch-2.1-beta. svn merge --ignore-ancestry -c 1520659 ../../trunk/