commit a9b2d3ae21172cb7b583f01d3ba6d836e238749f
author Pankaj Berde <pankaj@onlab.us> Fri Apr 05 13:19:51 2013 -0700
committer Pankaj Berde <pankaj@onlab.us> Fri Apr 05 13:19:51 2013 -0700
tree 0f70b4121fd6539fa891d3a371db4ba08d3243de
parent 20861b2a423c06c2dfc89a8c8d3297ae8cca403f

Fix Merge issues

scripts/cleanup-cassandra.sh

diff --git a/scripts/cleanup-cassandra.sh b/scripts/cleanup-cassandra.sh
index def4b59..4553fd1 100755
--- a/scripts/cleanup-cassandra.sh
+++ b/scripts/cleanup-cassandra.sh
@@ -1,3 +1,3 @@
 #! /bin/bash
-DIR=~/src/ONOS
-~/src/titan/titan-0.2.0/bin/gremlin.sh -e $DIR/scripts/cleanup-onos-db 
+DIR=~/ONOS
+~/ONOS/titan/gremlin.sh -e $DIR/scripts/cleanup-onos-db 

start-rest.sh

diff --git a/start-rest.sh b/start-rest.sh
index 8251c0f..01e7638 100755
--- a/start-rest.sh
+++ b/start-rest.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 # Change this accordingly
-ONOSDIR=${HOME}/src/ONOS
+ONOSDIR=${HOME}/ONOS
 script_name="topology_rest.py"
 
 #######################