Merge branch 'master' into 8561-node-pairing
authorradhika <radhika@curoverse.com>
Thu, 17 Mar 2016 15:29:44 +0000 (11:29 -0400)
committerradhika <radhika@curoverse.com>
Thu, 17 Mar 2016 15:29:44 +0000 (11:29 -0400)
commit3280225de5f5f3325cd406d154fe9eeed9ce020a
treef0e4cc8695ef000ce123c8c21b0a6d48acc51f5f
parent5e2e17fbe7f983eab083d3bb347c48c549a1d24c
parentd41326922d0f3489ac4a835990be2a1e1f49da12
Merge branch 'master' into 8561-node-pairing
services/nodemanager/arvnodeman/computenode/dispatch/__init__.py