Merge pull request #973 from corristo/master

Added hint about updating CocoaPods installation when Podfile.lock and Manifest.lock are not in sync

lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -152,7 +152,7 @@ module Pod
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
               if [[ $? != 0 ]] ; then
                   cat << EOM
-              error: The sandbox is not in sync with the Podfile.lock. Run 'pod install'.
+              error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
               EOM
                   exit 1
               fi

spec/unit/installer/user_project_integrator/target_integrator_spec.rb

@@ -95,7 +95,7 @@ module Pod
           diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
           if [[ $? != 0 ]] ; then
               cat << EOM
-          error: The sandbox is not in sync with the Podfile.lock. Run 'pod install'.
+          error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
           EOM
               exit 1
           fi