Merge branch 'dev' of https://github.com/VirtoCommerce/vc-community.git

VirtoCommerce · Apr 27, 2016 · 5a9fa39 · 5a9fa39
2 parents b3aa5b4 + a295908
commit 5a9fa39
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/PLATFORM/GlobalAssemblyInfo.cs b/PLATFORM/GlobalAssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyCompany("VirtoCommerce")]
 [assembly: AssemblyProduct("Virto Commerce 2.10")]
 [assembly: AssemblyCopyright("Copyright © VirtoCommerce 2011-2016")]
-[assembly: AssemblyFileVersion("2.10.1420.0")]
+[assembly: AssemblyFileVersion("2.10.1424.0")]
 [assembly: AssemblyVersion("2.10.0.0")]
 [assembly: AssemblyInformationalVersion("2.10")]
 

diff --git a/PLATFORM/VirtoCommerce.Platform.Web/Web.config b/PLATFORM/VirtoCommerce.Platform.Web/Web.config
@@ -27,10 +27,10 @@
         <!-- Database Connection String -->
         <add name="VirtoCommerce" connectionString="Data Source=(local);Initial Catalog=VirtoCommerce2;Persist Security Info=True;User ID=virto;Password=virto;MultipleActiveResultSets=True;Connect Timeout=420" providerName="System.Data.SqlClient" />
         <!-- Assets Connection String -->
-        <!--<add name="AssetsConnectionString" connectionString="provider=AzureBlobStorage;DefaultEndpointsProtocol=http;AccountName=virtotest;AccountKey=Qvy1huF8b0OE6upFh91/IMZPnETwhxe7BlRNZoZeJL59b921LeBb7zZZt03CiOVf7wVfPseUMKSXD8yz/rXVuQ==" />-->
-        <add name="AssetsConnectionString" connectionString="provider=LocalStorage;rootPath=~/App_Data/Assets;publicUrl=http://localhost/admin/Assets" />
+        <!--<add name="AssetsConnectionString" connectionString="provider=AzureBlobStorage;DefaultEndpointsProtocol=https;AccountName=yourAccountName;AccountKey=yourAccountKey" />-->
+        <add name="AssetsConnectionString" connectionString="provider=LocalStorage;rootPath=~/App_Data/Assets;publicUrl=http://localhost/admin/assets" />
         <!-- Used by CMS content module to manage storefront themes and static content -->
-        <!--<add name="CmsContentConnectionString" connectionString="provider=AzureBlobStorage;rootPath=cms-content;DefaultEndpointsProtocol=https;AccountName=virtotest;AccountKey=Qvy1huF8b0OE6upFh91/IMZPnETwhxe7BlRNZoZeJL59b921LeBb7zZZt03CiOVf7wVfPseUMKSXD8yz/rXVuQ==" />-->
+        <!--<add name="CmsContentConnectionString" connectionString="provider=AzureBlobStorage;rootPath=cms-content;DefaultEndpointsProtocol=https;AccountName=yourAccountName;AccountKey=yourAccountKey" />-->
         <add name="CmsContentConnectionString" connectionString="provider=LocalStorage;rootPath=..\..\STOREFRONT\VirtoCommerce.Storefront\App_Data\;publicUrl=http://localhost/admin/cms" />
         <!-- Search Connection String -->
         <!--<add name="SearchConnectionString" connectionString="provider=Elasticsearch;server=localhost:9200;scope=default" />-->

diff --git a/SDK/DotNet/VirtoCommerce.Client/VirtoCommerce.Client.nuspec b/SDK/DotNet/VirtoCommerce.Client/VirtoCommerce.Client.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>2.9.1324</version>
+    <version>2.10.1423</version>
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>

diff --git a/STOREFRONT/VirtoCommerce.Storefront/Web.config b/STOREFRONT/VirtoCommerce.Storefront/Web.config
@@ -8,7 +8,7 @@
     <connectionStrings>
         <add name="VirtoCommerceBaseUrl" connectionString="http://localhost/admin" />
         <add name="ContentConnectionString" connectionString="provider=LocalStorage;rootPath=~/App_Data" />
-        <!--<add name="ContentConnectionString" connectionString="provider=AzureBlobStorage;DefaultEndpointsProtocol=https;AccountName=youAccount;AccountKey=youKey/ATKw/HqfPn9qCA==;rootPath=cms-content" />-->
+        <!--<add name="ContentConnectionString" connectionString="provider=AzureBlobStorage;rootPath=cms-content;DefaultEndpointsProtocol=https;AccountName=yourAccountName;AccountKey=yourAccountKey" />-->
         <add name="RedisCache" connectionString="endpoint,password=SECRET,ssl=True,abortConnect=False" />
     </connectionStrings>