From 7af065fe4c0119545807ffeaa1dbec64a649b423 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Sat, 13 Oct 2012 11:39:06 +0100
Subject: [PATCH] Applying review comments.

---
 lib/services/core/servicebussettings.js     | 16 ++++++++--------
 lib/services/core/storageservicesettings.js |  6 ------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/services/core/servicebussettings.js b/lib/services/core/servicebussettings.js
index 9b4818bf9a..597cb792cd 100644
--- a/lib/services/core/servicebussettings.js
+++ b/lib/services/core/servicebussettings.js
@@ -71,11 +71,11 @@ ServiceBusSettings.createFromSettings = function (settings) {
   var matchedSpecs = ServiceSettings.matchedSpecification(
     settings,
     ServiceSettings.allRequired(
-      _serviceBusEndpointSetting,
-      _wrapNameSetting,
-      _wrapPasswordSetting
+      serviceBusEndpointSetting,
+      wrapNameSetting,
+      wrapPasswordSetting
     ),
-    ServiceSettings.optional(_wrapEndpointSetting)
+    ServiceSettings.optional(wrapEndpointSetting)
   );
 
   if (matchedSpecs) {
@@ -94,13 +94,13 @@ ServiceBusSettings.createFromSettings = function (settings) {
     var namespace = parsedUrl.host.split('.')[0];
 
     var issuerName  = util.tryGetValueInsensitive(
-        ConnectionStringKeys.SHARED_SECRET_ISSUER_NAME,
-        settings
+      ConnectionStringKeys.SHARED_SECRET_ISSUER_NAME,
+      settings
     );
 
     var issuerValue = util.tryGetValueInsensitive(
-        ConnectionStringKeys.SHARED_SECRET_VALUE_NAME,
-        settings
+      ConnectionStringKeys.SHARED_SECRET_VALUE_NAME,
+      settings
     );
     
     return new ServiceBusSettings(
diff --git a/lib/services/core/storageservicesettings.js b/lib/services/core/storageservicesettings.js
index 5477b25da5..2329a87df7 100644
--- a/lib/services/core/storageservicesettings.js
+++ b/lib/services/core/storageservicesettings.js
@@ -198,15 +198,9 @@ StorageServiceSettings._createStorageServiceSettings = function (settings, blobE
 StorageServiceSettings.createFromSettings = function (settings) {
   // Devstore case
   var matchedSpecs = ServiceSettings.matchedSpecification(
-<<<<<<< HEAD
     tokenizedSettings,
     ServiceSettings.allRequired(useDevelopmentStorageSetting),
     ServiceSettings.optional(developmentStorageProxyUriSetting)
-=======
-    settings,
-    ServiceSettings.allRequired(_useDevelopmentStorageSetting),
-    ServiceSettings.optional(_developmentStorageProxyUriSetting)
->>>>>>> plumbing
   );
 
   if (matchedSpecs) {