git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7dce85 2a77ace)
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
authorAndy Bavier <acb@cs.princeton.edu>
Thu, 30 Aug 2012 21:13:26 +0000 (17:13 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Thu, 30 Aug 2012 21:13:26 +0000 (17:13 -0400)
1  2 
sfa/openstack/osaggregate.py patch | diff1 | diff2 | blob | history

diff --cc sfa/openstack/osaggregate.py
Simple merge
sfa