Merge pull request #495 from ceph/wip-11645

author Andrew Schoen <andrew.schoen@gmail.com>

Thu, 21 May 2015 15:38:38 +0000 (10:38 -0500)

committer Andrew Schoen <andrew.schoen@gmail.com>

Thu, 21 May 2015 15:38:38 +0000 (10:38 -0500)
author Andrew Schoen <andrew.schoen@gmail.com>
Thu, 21 May 2015 15:38:38 +0000 (10:38 -0500)
committer Andrew Schoen <andrew.schoen@gmail.com>
Thu, 21 May 2015 15:38:38 +0000 (10:38 -0500)
diff --cc teuthology/suite.py
Simple merge
diff --cc teuthology/task/internal.py
Simple merge
author	Andrew Schoen <andrew.schoen@gmail.com>
	Thu, 21 May 2015 15:38:38 +0000 (10:38 -0500)
committer	Andrew Schoen <andrew.schoen@gmail.com>
	Thu, 21 May 2015 15:38:38 +0000 (10:38 -0500)
		1	2
teuthology/suite.py	patch \|	diff1 \|	diff2 \|	blob \| history
teuthology/task/internal.py	patch \|	diff1 \|	diff2 \|	blob \| history