Merge branch 'release/1.97.10'

netz98 · Jan 6, 2016 · c365cd4 · c365cd4
2 parents d9293e9 + a1a1a2d
commit c365cd4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/changes.txt b/changes.txt
@@ -2,6 +2,12 @@
 RECENT CHANGES
 **************
 
+=======
+1.97.10
+=======
+
+* #746 Try composer required version (reported by Vinai Kopp)
+
 ======
 1.97.9
 ======

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "symfony/validator": "~2.3",
         "n98/junit-xml": "~1.0",
         "fzaninotto/faker": "~1.4",
-        "composer/composer": "1.0.*@dev",
+        "composer/composer": "dev-master#9f6fdfd703f433bd0777fd89fb4684908a6c4f06",
         "twig/twig": "~1.0"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/N98/Magento/Application.php b/src/N98/Magento/Application.php
@@ -35,7 +35,7 @@ class Application extends BaseApplication
     /**
      * @var string
      */
-    const APP_VERSION = '1.97.9';
+    const APP_VERSION = '1.97.10';
 
     /**
      * @var int

diff --git a/src/N98/Magento/Command/System/Cron/RunCommand.php b/src/N98/Magento/Command/System/Cron/RunCommand.php
@@ -114,6 +114,7 @@ protected function askJobCode(OutputInterface $output, array $jobs)
     {
         $index = 0;
         $keyMap = array_keys($jobs);
+        $question = array();
 
         foreach ($jobs as $key => $job) {
             $question[] = '<comment>[' . ($index++) . ']</comment> ' . $job['Job'] . PHP_EOL;

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.97.9
+1.97.10