Merge pull request #796 from dachary/wip-archive-upload

author Zack Cerza <zack@cerza.org>

Mon, 29 Feb 2016 20:20:05 +0000 (13:20 -0700)

committer Zack Cerza <zack@cerza.org>

Mon, 29 Feb 2016 20:20:05 +0000 (13:20 -0700)
author Zack Cerza <zack@cerza.org>
Mon, 29 Feb 2016 20:20:05 +0000 (13:20 -0700)
committer Zack Cerza <zack@cerza.org>
Mon, 29 Feb 2016 20:20:05 +0000 (13:20 -0700)
diff --cc scripts/openstack.py
Simple merge
diff --cc scripts/suite.py
Simple merge
diff --cc teuthology/openstack/__init__.py
Simple merge
author	Zack Cerza <zack@cerza.org>
	Mon, 29 Feb 2016 20:20:05 +0000 (13:20 -0700)
committer	Zack Cerza <zack@cerza.org>
	Mon, 29 Feb 2016 20:20:05 +0000 (13:20 -0700)
		1	2
scripts/openstack.py	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/suite.py	patch \|	diff1 \|	diff2 \|	blob \| history
teuthology/openstack/__init__.py	patch \|	diff1 \|	diff2 \|	blob \| history