Merge pull request #942 from dmick/wip-token

author Zack Cerza <zack@cerza.org>

Mon, 29 Aug 2016 23:06:47 +0000 (17:06 -0600)

committer GitHub <noreply@github.com>

Mon, 29 Aug 2016 23:06:47 +0000 (17:06 -0600)
author Zack Cerza <zack@cerza.org>
Mon, 29 Aug 2016 23:06:47 +0000 (17:06 -0600)
committer GitHub <noreply@github.com>
Mon, 29 Aug 2016 23:06:47 +0000 (17:06 -0600)
diff --cc teuthology/nuke/__init__.py
Simple merge
diff --cc teuthology/openstack/__init__.py
Simple merge
author	Zack Cerza <zack@cerza.org>
	Mon, 29 Aug 2016 23:06:47 +0000 (17:06 -0600)
committer	GitHub <noreply@github.com>
	Mon, 29 Aug 2016 23:06:47 +0000 (17:06 -0600)
		1	2
teuthology/nuke/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history
teuthology/openstack/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history