Merge branch 'master' of github.com:quantopian/zipline into profiling_zipline

Conflicts:
	zipline/gens/tradesimulation.py
This commit is contained in:
scottsanderson
2012-08-21 15:02:19 -04:00
+1
View File
@@ -260,6 +260,7 @@ class AlgorithmSimulator(object):
for event in snapshot:
yield event.perf_message
break
# We're still in the warmup period. Use the event to
# update our universe, but don't yield any perf messages,
# and don't send a snapshot to handle_data.