From 77185f9beeb6214861c0ded6ea1b5b21a388e007 Mon Sep 17 00:00:00 2001
From: Chris Henry <henry.christopher@gmail.com>
Date: Sun, 18 Jan 2015 16:18:34 -0500
Subject: [PATCH] Change timestamp format to ISO 8601, as per
 http://docs.aws.amazon.com/cli/latest/userguide/cli-using-param.html

---
 moto/ec2/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/moto/ec2/models.py b/moto/ec2/models.py
index 574621001..166858960 100644
--- a/moto/ec2/models.py
+++ b/moto/ec2/models.py
@@ -299,7 +299,7 @@ class Instance(BotoInstance, TaggedEC2Resource):
         self.subnet_id = kwargs.get("subnet_id")
         self.key_name = kwargs.get("key_name")
         self.source_dest_check = "true"
-        self.launch_time = datetime.now().strftime('%y-%m-%dT%H:%M:%S%z')
+        self.launch_time = datetime.now().isoformat()
 
         self.block_device_mapping = BlockDeviceMapping()
         self.block_device_mapping['/dev/sda1'] = BlockDeviceType(volume_id=random_volume_id())