From 50bb5704a888c392c271e7f151ef31533ed17d55 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Thu, 23 Feb 2012 13:46:58 -0800
Subject: [PATCH] bug 13965

Remove listPhysicalNetworks API altogether from network step
---
 ui/scripts/instances.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6017d0651e9..ec9ee7066ac 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -315,6 +315,7 @@
                     });
 
 																				
+<<<<<<< HEAD
 <<<<<<< HEAD
 										var apiCmd = "listNetworkOfferings&guestiptype=Isolated&supportedServices=sourceNat&state=Enabled&specifyvlan=false&zoneid=" + args.currentData.zoneid ; 
 										var array1 = [];
@@ -364,6 +365,12 @@
 											}																
 										}																		
 >>>>>>> ee6dc03... bug 13965
+=======
+										var apiCmd = "listNetworkOfferings&guestiptype=Isolated&supportedServices=sourceNat&state=Enabled&specifyvlan=false"; 
+										var array1 = [];
+                    var guestTrafficTypeTotal = 0;
+
+>>>>>>> 3c61e20... bug 13965
                     $.ajax({
                       url: createURL(apiCmd + array1.join("")), //get the network offering for isolated network with sourceNat
                       dataType: "json",