Merging drush-ops/drush#2392.

acquia · Oct 26, 2016 · f9fa21a · f9fa21a
1 parent bba2492
commit f9fa21a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -83,7 +83,9 @@
                 "Adding composer.json support to make-convert command":
                 "https://github.com/drush-ops/drush/commit/ce82b946d49b09cd33da5ca84feb24a6c35f8f8e.patch",
                 "The batch table may not exist by the time _drush_backend_batch_process() is called in 8.x-1.x":
-                "https://github.com/drush-ops/drush/commit/c389aebb7d3e26ff0f544684d8b3ec3528107e55.diff"
+                "https://github.com/drush-ops/drush/commit/c389aebb7d3e26ff0f544684d8b3ec3528107e55.diff",
+                "Fix composer branch-alias constraint":
+                "https://github.com/drush-ops/drush/commit/83436c8ea505223a1868dce130d4ca1b4e558711.diff"
             },
             "drupal/metatag": {
                 "2786795 - DrupalConsole integration breaks Drush":

diff --git a/composer.lock b/composer.lock