Merge pull request #1147 from dpfaffenbauer/release/2.1.0

[2.1.0] prepare release
coreshop · Oct 25, 2019 · 686e5a0 · 686e5a0
2 parents e6657b6 + 2d2820a
commit 686e5a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md
@@ -1,5 +1,13 @@
 # Within 2.1
 
+## 2.1.0
+ - Bugs:
+   - [ThemeBundle] add missing dependency to pimcore-bundle (https://github.com/coreshop/CoreShop/pull/1138, https://github.com/coreshop/CoreShop/pull/1140)
+   - [ResourceBundle] fix naming of parameter sortBy (https://github.com/coreshop/CoreShop/pull/1132)
+   - [Quantity Price Rules] Check Inherited Product Quantity Price Range Data (https://github.com/coreshop/CoreShop/pull/1143)
+   - [FrontendBundle] allow usage of auto-wired Frontend Controllers (https://github.com/coreshop/CoreShop/pull/1141)
+   - [OrderBundle] CartItem Quantity has to be > 0 (https://github.com/coreshop/CoreShop/pull/1144)
+
 ## 2.1.0-rc.2
  - Features:
    - [IndexBundle] allow for more complex doctrine types in index (https://github.com/coreshop/CoreShop/pull/1110)

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -17,7 +17,7 @@ final class Version
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '1';
     const RELEASE_VERSION = '0';
-    const EXTRA_VERSION = 'rc.2';
+    const EXTRA_VERSION = '';
 
     /**
      * @return string