Merge branch 'anurse/2006-invalidcscfg'

Conflicts: src/NuGetGallery.Cloud/ServiceDefinition.csdef
NuGet · May 30, 2014 · 1aea180 · 1aea180
2 parents e6b1952 + ac4b795
commit 1aea180
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg b/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg
@@ -32,6 +32,7 @@
       <!-- *************** -->
       <!-- Depending on your policy, these likely do not need to vary -->
       <!-- SmtpUri is expected to be of the format: smtps://username:password@host:port. Note that if username contains an "@", you need to URI Encode it! -->
+      <Setting name="Gallery.CollectPerfLogs" value="true" />
       <Setting name="Gallery.Brand" value="NuGet Gallery" />
       <Setting name="Gallery.SmtpUri" value="" />
       <Setting name="Gallery.HasWorker" value="true" />

diff --git a/src/NuGetGallery.Cloud/ServiceDefinition.csdef b/src/NuGetGallery.Cloud/ServiceDefinition.csdef
@@ -22,6 +22,7 @@
       <Setting name="Gallery.HasWorker" />
       <Setting name="Gallery.SearchServiceUri" />
       <Setting name="Gallery.AutoUpdateSearchIndex" />
+      <Setting name="Gallery.CollectPerfLogs" />
       <Setting name="Auth.MicrosoftAccount.Enabled" />
       <Setting name="Auth.MicrosoftAccount.ClientId" />
       <Setting name="Auth.MicrosoftAccount.ClientSecret" />