Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F0DA1187E for ; Thu, 24 Apr 2014 07:31:24 +0000 (UTC) Received: (qmail 19408 invoked by uid 500); 24 Apr 2014 07:31:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 19192 invoked by uid 500); 24 Apr 2014 07:31:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 19182 invoked by uid 99); 24 Apr 2014 07:31:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Apr 2014 07:31:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 19A6F990747; Thu, 24 Apr 2014 07:31:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Message-Id: <8d4902ac8ec746909792ebb81f840690@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 7df3061 Date: Thu, 24 Apr 2014 07:31:22 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 2e95b5b70 -> 7df30611f CLOUDSTACK-6492: fixed strftime import and its usage in deployDataCenter.py Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7df30611 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7df30611 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7df30611 Branch: refs/heads/master Commit: 7df30611fed56cbaad291ad376bf49d86b408fec Parents: 2e95b5b Author: SrikanteswaraRao Talluri Authored: Thu Apr 24 13:00:29 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Thu Apr 24 13:00:29 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7df30611/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index de0e11b..b241d15 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -36,7 +36,7 @@ from marvin.config.test_data import test_data from sys import exit import os import pickle -from time import sleep, time +from time import sleep, time, strftime from optparse import OptionParser @@ -67,7 +67,7 @@ class DeployDataCenters(object): if self.__logFolderPath: dc_file_path = self.__logFolderPath + "/dc_entries.obj" else: - ts = time.strftime("%b_%d_%Y_%H_%M_%S", + ts = strftime("%b_%d_%Y_%H_%M_%S", time.localtime()) dc_file_path = "dc_entries_" + str(ts) + ".obj" file_to_write = open(dc_file_path, 'w')