Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel devel
authorMarco Yuen <marcoy@gmail.com>
Tue, 12 Jul 2011 16:20:55 +0000 (12:20 -0400)
committerMarco Yuen <marcoy@gmail.com>
Tue, 12 Jul 2011 16:20:55 +0000 (12:20 -0400)
commitd115a860bee5974adc2a9199289dab1bbaaf294e
tree74fdd7d9af311aceb245cee8c5af0da9170df610
parent051f6182f4af8e3a82d9e6b4b7b4ba2f33ab2c7b
parent0e9c14f7a5d394ee5793d2b0ffcc8b6f0697cf8a
Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel

Conflicts:
plugins/euca_iptables.py