Merge branch 'planetstack' of ssh://git.planet-lab.org/git/nodemanager into planetstack
authorAndy Bavier <acb@cs.princeton.edu>
Tue, 20 Aug 2013 17:32:24 +0000 (13:32 -0400)
committerAndy Bavier <acb@cs.princeton.edu>
Tue, 20 Aug 2013 17:32:24 +0000 (13:32 -0400)
1  2 
nodemanager.py

diff --cc nodemanager.py
Simple merge