Permalink
Browse files

Merge branch 'refactor_eoi_tests' of github.com:ooici/coi-services in…

…to refactor_eoi_tests

Conflicts:
	ion/agents/data/handlers/base_data_handler.py
	ion/agents/data/handlers/test/test_slocum_data_handler.py
	ion/services/dm/utility/granule/record_dictionary.py
	ion/services/dm/utility/granule/test/test_record_dictionary.py
  • Loading branch information...
2 parents 7066334 + 4ab60c6 commit 0fa00e9d4b26838d5e8349245dfb52afe5472f5e Tim Giguere committed Aug 15, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 ion/agents/data/handlers/base_data_handler.py
@@ -50,6 +50,7 @@ def __init__(self, stream_registrar, dh_config):
self._polling_glet = None
self._dh_config = {}
self._terminate_polling = None
+
self._params = {
'POLLING_INTERVAL' : 3600,
'PATCHABLE_CONFIG_KEYS' : ['stream_id','constraints']

0 comments on commit 0fa00e9

Please sign in to comment.