projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7212444
7d5d57a
)
Merge branch 'master' into 7454-azure-custom-data
author
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 11 Dec 2015 19:59:02 +0000
(14:59 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Fri, 11 Dec 2015 19:59:02 +0000
(14:59 -0500)
1
2
services/nodemanager/arvnodeman/computenode/driver/azure.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/nodemanager/arvnodeman/computenode/driver/azure.py
Simple merge