Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/infra-puppet
  Commit: 530ddb5f1b52dc004485a9ca7ebc89a5e5f5cb38
      
https://github.com/jenkinsci/infra-puppet/commit/530ddb5f1b52dc004485a9ca7ebc89a5e5f5cb38
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2013-11-17 (Sun, 17 Nov 2013)

  Changed paths:
    M run.sh

  Log Message:
  -----------
  don't let local modifications from blocking puppet apply.

If a local workspace is modified intentionally or unintentionally,
"git pull" will refuse to overwrite local changes with what's in
the repo, and puppet application will block forever.

It'd be much better to automatically correct this situation,
especially given that we have no ability to detect failures
to apply puppet configuration currently.

This has a risk of overwriting local changes anyone is making
on that box, but one is not supposed to do that anyway!



-- 
You received this message because you are subscribed to the Google Groups 
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to