git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
051f618
0e9c14f
)
Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel
devel
author
Marco Yuen
<marcoy@gmail.com>
Tue, 12 Jul 2011 16:20:55 +0000
(12:20 -0400)
committer
Marco Yuen
<marcoy@gmail.com>
Tue, 12 Jul 2011 16:20:55 +0000
(12:20 -0400)
Conflicts:
plugins/euca_iptables.py
Trivial merge
git://git.onelab.eu / nodemanager.git / commitdiff