commit 951cc49e53cf23f59040011f9f8ca4dd2f0eb623
author Jon Hall <jhall@onlab.us> Wed Apr 16 11:05:26 2014 -0700
committer Jon Hall <jhall@onlab.us> Wed Apr 16 11:05:26 2014 -0700
tree 90b4d6ffdf6b3cc20953c84314c44476dd043fc5
parent 1dcc1d1321381d1f994b525296c0548db3598a96
parent 7373a8139b3332e732b002a87670d04d7ba91e0d

Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONLabTest

Conflicts:
	TestON/drivers/common/cli/onosclidriver.py

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index b2107c9..caf60db 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -808,7 +808,7 @@
 #********************************************************           
 
 
-    def compile(self):
+    def git_compile(self):
         '''
         Compiles ONOS
         First runs mvn clean then mvn compile
@@ -860,7 +860,6 @@
             main.cleanup()
             main.exit()
 
-
     def tcpdump(self, intf = "eth0"):
         '''
         Runs tpdump on an intferface and saves in onos-logs under the ONOS home directory