projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e2e17f
d413269
)
Merge branch 'master' into 8561-node-pairing
author
radhika <radhika@curoverse.com>
Thu, 17 Mar 2016 15:29:44 +0000
(11:29 -0400)
committer
radhika <radhika@curoverse.com>
Thu, 17 Mar 2016 15:29:44 +0000
(11:29 -0400)
1
2
services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
Simple merge