5037: Merge branch 'master' into 5037-nonocache
authorTom Clegg <tom@curoverse.com>
Tue, 10 Feb 2015 14:55:02 +0000 (09:55 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 10 Feb 2015 14:55:02 +0000 (09:55 -0500)
commit46efb1e7f49d08095a6a49a4c6aff045c5eb6f16
treeaac009fd4edbd7cc5736c9774b1dc8d7381fef4d
parent2d7883822203e66afee1a36c7e86a844bc23719c
parentfc8e572937f2fd61bdc1e7f34a2e3f9a5cebd7ff
5037: Merge branch 'master' into 5037-nonocache
services/fuse/setup.py
services/nodemanager/setup.py