git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ff44908
d1618de
)
Merge branch 'master' into eucalyptus-devel
author
Marco Yuen
<marcoy@gmail.com>
Wed, 6 Jul 2011 18:20:59 +0000
(14:20 -0400)
committer
Marco Yuen
<marcoy@gmail.com>
Wed, 6 Jul 2011 18:20:59 +0000
(14:20 -0400)
1
2
sfa/managers/aggregate_manager_eucalyptus.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sfa/managers/aggregate_manager_eucalyptus.py
Simple merge
git://git.onelab.eu / sfa.git / commitdiff