conflict resolution

diff --combined planetstack/core/models/network.py
index 8b88865,cfaffc3..c7a97a9
--- 1/planetstack/core/models/network.py
--- 2/planetstack/core/models/network.py
+++ b/planetstack/core/models/network.py
@@@ -1,6 -1,5 +1,6 @@@
  import os
  import socket
 +import sys
  from django.db import models
  from core.models import PlCoreBase, Site, Slice, Sliver, Controller
  from core.models import ControllerLinkManager,ControllerLinkDeletionManager
@@@ -85,13 -84,13 +85,13 @@@ class NetworkTemplate(PlCoreBase)
          # somehow these got set wrong inside of the live database. Remove this
          # code after all is well...
          if (self.topology_kind=="BigSwitch"):
 -            print "XXX warning: topology_kind invalid case"
 +            print >> sys.stderr, "XXX warning: topology_kind invalid case"
              self.topology_kind="bigswitch"
          elif (self.topology_kind=="Physical"):
 -            print "XXX warning: topology_kind invalid case"
 +            print >> sys.stderr, "XXX warning: topology_kind invalid case"
              self.topology_kind="physical"
          elif (self.topology_kind=="Custom"):
 -            print "XXX warning: topology_kind invalid case"
 +            print >> sys.stderr, "XXX warning: topology_kind invalid case"
              self.toplogy_kind="custom"
  
      def __unicode__(self):  return u'%s' % (self.name)
@@@ -144,7 -143,7 +144,7 @@@ class Network(PlCoreBase)
              qs = Network.objects.filter(owner__in=slices)
          return qs
  
- class ControllerNetworks(PlCoreBase):
+ class ControllerNetwork(PlCoreBase):
      objects = ControllerLinkManager()
      deleted_objects = ControllerLinkDeletionManager()
  

diff --combined planetstack/core/xoslib/up.sh
index 206c0d7,bc2d469..206c0d7
mode 100755,100644..100644
--- 1/planetstack/core/xoslib/up.sh
--- 2/planetstack/core/xoslib/up.sh
+++ b/planetstack/core/xoslib/up.sh
@@@ -1,6 -1,4 +1,6 @@@
 -scp static/js/*.js princeton_planetstack@node43.princeton.vicci.org:/opt/planetstack/core/xoslib/static/js/
 -scp templates/mustache/*.mustache princeton_planetstack@node43.princeton.vicci.org:/opt/planetstack/core/xoslib/templates/mustache/
 -scp static/xsh/*.js princeton_planetstack@node43.princeton.vicci.org:/opt/planetstack/core/xoslib/static/xsh/
 -scp dashboards/*.html princeton_planetstack@node43.princeton.vicci.org:/opt/planetstack/templates/admin/dashboard/
 +SLICE=princeton_planetstack
 +HOST=node54.princeton.vicci.org
 +#SLICE=service_vini
 +#HOST=bilby.cs.princeton.edu
 +rsync -avz --exclude "__history" --exclude "*~" -e ssh . $SLICE@$HOST:/opt/planetstack/core/xoslib/
 +