Merge branch 'planetstack' of ssh://git.planet-lab.org/git/nodemanager into planetstack
authorAndy Bavier <acb@cs.princeton.edu>
Wed, 20 Nov 2013 20:58:29 +0000 (15:58 -0500)
committerAndy Bavier <acb@cs.princeton.edu>
Wed, 20 Nov 2013 20:58:29 +0000 (15:58 -0500)
commitee57a7a0eff72a29d1bdac57eb95de2f951dea7b
treed7f1dfc38140f53fdb475943265bacdc98858cfc
parent15bbeb4bdf214cccf387d8d2ff4f219bf9d3fdef
parent9b0a87f7c7e4f548e09f5fd6482e89a551c66a27
Merge branch 'planetstack' of ssh://git.planet-lab.org/git/nodemanager into planetstack