Applying review comments.

andrerod · Oct 13, 2012 · 7af065f · 7af065f
1 parent a499fbe
commit 7af065f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git 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
@@ -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) {