Permalink
Browse files

merge from ooici

  • Loading branch information...
1 parent 51a298c commit 9cd6d4297509e9a70954bc6b0db024a19dea028f @wfrench wfrench committed Dec 5, 2012
Showing with 0 additions and 11 deletions.
  1. +0 −11 ion/agents/instrument/driver_process.py
@@ -35,11 +35,7 @@ class DriverProcessType(BaseEnum):
Base states for driver launcher types.
"""
PYTHON_MODULE = 'ZMQPyClassDriverLauncher'
-<<<<<<< HEAD
- EGG = 'ZMQEggDriverLauncherG'
-=======
EGG = 'ZMQEggDriverLauncher'
->>>>>>> 8742114278a502a40ebd28480e69b0bdae763a46
class DriverProcess(object):
@@ -342,16 +338,13 @@ def get_packet_factories(self, stream_info):
@param stream_info
-<<<<<<< HEAD
def get_packet_factories(self, stream_info):
"""
Construct packet factories from PACKET_CONFIG member of the driver_config
and the given stream_info dict.
@param stream_info
-=======
->>>>>>> 8742114278a502a40ebd28480e69b0bdae763a46
@retval a dict indexed by stream name of the packet factories defined.
"""
@@ -431,12 +424,8 @@ def get_packet_factories(self, stream_info):
#
# return self._packet_factories
-<<<<<<< HEAD
-class ZMQEggDriverLauncher(DriverProcess):
-=======
class ZMQEggDriverProcess(DriverProcess):
->>>>>>> 8742114278a502a40ebd28480e69b0bdae763a46
"""
Object to facilitate driver processes launch from an egg as an 'eggsecutable'
"""

0 comments on commit 9cd6d42

Please sign in to comment.