From: Jenkins Date: Fri, 9 Dec 2016 08:52:31 +0000 (+0000) Subject: Merge "Remove extra ^M for json file" X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=722c543e9e47883bd106e72d1a4eda40bbd453e5;p=osstest%2Fopenstack-nova.git Merge "Remove extra ^M for json file" --- 722c543e9e47883bd106e72d1a4eda40bbd453e5