Permalink
Browse files

Applying review comments.

  • Loading branch information...
1 parent a499fbe commit 7af065fe4c0119545807ffeaa1dbec64a649b423 Andre Rodrigues committed Oct 13, 2012
Showing with 8 additions and 14 deletions.
  1. +8 −8 lib/services/core/servicebussettings.js
  2. +0 −6 lib/services/core/storageservicesettings.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(
@@ -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) {

0 comments on commit 7af065f

Please sign in to comment.