merged 2.1

symfony · Sep 13, 2012 · 61d57f7 · 61d57f7
2 parents 885d473 + f23fd03
commit 61d57f7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 32 deletions.
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
@@ -0,0 +1,12 @@
+CHANGELOG for 2.1.x
+===================
+
+This changelog references the relevant changes (bug and security fixes) done
+in 2.1 minor versions.
+
+To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
+To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.1.0...v2.1.1
+
+* 2.1.1 (2012-09-11)
+
+ * fix Composer configuration
diff --git a/composer.json b/composer.json
@@ -21,38 +21,38 @@
         "twig/twig": ">=1.9.1,<2.0-dev"
     },
     "replace": {
-        "symfony/doctrine-bridge": "2.1.*",
-        "symfony/monolog-bridge": "2.1.*",
-        "symfony/propel1-bridge": "2.1.*",
-        "symfony/swiftmailer-bridge": "2.1.*",
-        "symfony/twig-bridge": "2.1.*",
-        "symfony/framework-bundle": "2.1.*",
-        "symfony/security-bundle": "2.1.*",
-        "symfony/twig-bundle": "2.1.*",
-        "symfony/web-profiler-bundle": "2.1.*",
-        "symfony/browser-kit": "2.1.*",
-        "symfony/class-loader": "2.1.*",
-        "symfony/config": "2.1.*",
-        "symfony/console": "2.1.*",
-        "symfony/css-selector": "2.1.*",
-        "symfony/dependency-injection": "2.1.*",
-        "symfony/dom-crawler": "2.1.*",
-        "symfony/event-dispatcher": "2.1.*",
-        "symfony/filesystem": "2.1.*",
-        "symfony/finder": "2.1.*",
-        "symfony/form": "2.1.*",
-        "symfony/http-foundation": "2.1.*",
-        "symfony/http-kernel": "2.1.*",
-        "symfony/locale": "2.1.*",
-        "symfony/options-resolver": "2.1.*",
-        "symfony/process": "2.1.*",
-        "symfony/routing": "2.1.*",
-        "symfony/security": "2.1.*",
-        "symfony/serializer": "2.1.*",
-        "symfony/templating": "2.1.*",
-        "symfony/translation": "2.1.*",
-        "symfony/validator": "2.1.*",
-        "symfony/yaml": "2.1.*"
+        "symfony/doctrine-bridge": "self.version",
+        "symfony/monolog-bridge": "self.version",
+        "symfony/propel1-bridge": "self.version",
+        "symfony/swiftmailer-bridge": "self.version",
+        "symfony/twig-bridge": "self.version",
+        "symfony/framework-bundle": "self.version",
+        "symfony/security-bundle": "self.version",
+        "symfony/twig-bundle": "self.version",
+        "symfony/web-profiler-bundle": "self.version",
+        "symfony/browser-kit": "self.version",
+        "symfony/class-loader": "self.version",
+        "symfony/config": "self.version",
+        "symfony/console": "self.version",
+        "symfony/css-selector": "self.version",
+        "symfony/dependency-injection": "self.version",
+        "symfony/dom-crawler": "self.version",
+        "symfony/event-dispatcher": "self.version",
+        "symfony/filesystem": "self.version",
+        "symfony/finder": "self.version",
+        "symfony/form": "self.version",
+        "symfony/http-foundation": "self.version",
+        "symfony/http-kernel": "self.version",
+        "symfony/locale": "self.version",
+        "symfony/options-resolver": "self.version",
+        "symfony/process": "self.version",
+        "symfony/routing": "self.version",
+        "symfony/security": "self.version",
+        "symfony/serializer": "self.version",
+        "symfony/templating": "self.version",
+        "symfony/translation": "self.version",
+        "symfony/validator": "self.version",
+        "symfony/yaml": "self.version"
     },
     "require-dev": {
         "doctrine/dbal": ">=2.2,<2.4-dev",