Merge branch 'master' of /home/jkoelker/openstack-skeleton
Merge openstack-skeleton into templates
merge in upstream
Merge commit '99b2c6c202b1ec450e5f7bc1c4080f8c36773376'
Split functions to avoid eventlet import.

Some of these functions are used in setup.py. In a virtualenv
based workflow, python setup.py sdist is called to create a
tarball which is then installed into the virtualenv. These
functions need to be in a separate file so that they can be
imported by setup.py without eventlet needing to be installed.

Change-Id: I6f7dc9614895b8c91135c62373b98afe55e1fc7d
Updated tox config for multi-python testing.

Change-Id: Ib1f768c6783db0e63cb51dfc767ae5a31a295c76
Add git vcsversion method.

Leaving in the branch_nick for now - I think we need to go through the
projects using this code and ensure that they aren't going to get screwed
before we remove it.

Change-Id: Ib91b5af050244f44cd811ca47cb6e2c53ef74ddb
Add git changelog method.

Change-Id: I71d99f00b2154bf151a1521016118ba6bd088f79
Merge "Disable ConfigParser interpolation (lp#930270)"
Several changes that I accidentally committed to d2to1's old repository. See the changes to the changelog for more details.

git-svn-id: https://svn.stsci.edu/svn/ssb/stsci_python/d2to1/trunk@15173 fe389314-cf27-0410-b35b-8c050e845b92
Merge changes I71d99f00,Ib91b5af0

* changes:
  Add git changelog method.
  Add git vcsversion method.
Merge "Avoid leaking secrets into config logging."
Merge "Finish implementing MultiStrOpt"
Merge "Make 'yes' also a true boolean"
Merge "Add greenthread local storage model from nova"
Merge "Add generic PasteDeploy app and filter factories"
Merge "Create openstack.common.timeutils."
Add AUTHORS generation function.

Change-Id: I0adbf0755a0191c7b68af9ca2f6e50c787ee7043
Handle authors existed before VCS was around.

Bug: 976267

The list of such authors are stored in AUTHORS.in file. When
auto generating AUTHORS file, include them as well.

* openstack/common/setup.py
  __doc__: For all methods, remove space and include period.
  generate_authors(): If AUTHORS.in file exist, append the
  content to AUTHORS file.

Change-Id: I05da1e561383cc151e7ef34e75a4600e3afdda6e
Merge "Update exception from importutils.import_class()."