Merge branch 'master' into feature/generalize-cart-comm

Conflicts: distarray/local/base.py distarray/local/localarray.py distarray/local/tests/test_base.py
enthought · Mar 20, 2014 · 526d9c7 · 526d9c7
2 parents e82f8f6 + ebd6e4e
commit 526d9c7
Show file tree

Hide file tree

Showing 8 changed files with 226 additions and 322 deletions.
diff --git a/distarray/local/base.py b/distarray/local/base.py