Merge branch 'cachey' of github.com:mrocklin/dask into cachey

Conflicts: dask/async.py dask/diagnostics/cache.py dask/diagnostics/tests/test_cache.py
dask · Aug 3, 2015 · 571422c · 571422c
2 parents dcfebeb + 821c972
commit 571422c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dask/async.py b/dask/async.py
@@ -432,7 +432,10 @@ def get_async(apply_async, num_workers, dsk, result, cache=None,
         result_flat = set([result])
     results = set(result_flat)
 
+<<<<<<< HEAD
     dsk = dsk.copy()
+=======
+>>>>>>> 821c9728341e13f229b0fd8f41b5d553dcad1ff7
     for f in start_cbs:
         f(dsk)
 

diff --git a/dask/diagnostics/cache.py b/dask/diagnostics/cache.py
@@ -18,7 +18,6 @@ class Cache(Diagnostic):
     >>> cache.register()    # or use globally
     >>> cache.unregister()
     """
-
     def __init__(self, cache, *args, **kwargs):
         if isinstance(cache, Number):
             cache = cachey.Cache(cache, *args, **kwargs)