Updated openstack/openstack
Project: openstack-dev/devstack  bfbcef08879fd741f0ffde1a7ca7a4eaff7d85da
null
Make sure not to revert local changes.

"git diff --quiet" has a bug ignoring local changes if there's a
unchanged file with a newer timestamp.  This patch works around
the bug.

Change-Id: I0ddc24e0f7af21287c43c1e04dd166ebff6f2dca
Closes-Bug: 1264422
Updated openstack/openstack
Project: openstack/swift  61f9380225978dc51ec5a886391d06ec4f7f745e
null
Move test.unit.locale out of gettext's way

When I run unittests on my laptop I get an ImportError from gettext who tries
to "from locale import normalize" and says "ImportError: cannot import name
normalize".  Whit this patch unittests works, not sure why this problem
doesn't show up in my other dev environments.

Also this seems like good form since 'locale' is already a stdlib module.

Change-Id: If0fcd66ce391665b4e4127c610de3246db409a68