MAGETWO-58017: [GITHUB] Error creating configurable products in 2.1.1 #6424

Igor Melnikov · Igor Melnikov · commit b4ff17d5a1b9 · 2016-09-19T10:14:48.000-05:00
Merging with remote branch, conflicts:
app/code/Magento/Deploy/Model/DeployManager.php
diff --git a/app/code/Magento/Deploy/Model/DeployManager.php b/app/code/Magento/Deploy/Model/DeployManager.php
@@ -205,17 +205,4 @@ private function getProcessesAmount()
     {
         return isset($this->options[Options::JOBS_AMOUNT]) ? (int)$this->options[Options::JOBS_AMOUNT] : 0;
     }
-
-    /**
-     * Save version of deployed files
-     * @return void
-     */
-    private function saveDeployedVersion()
-    {
-        if (!$this->idDryRun) {
-            $version = (new \DateTime())->getTimestamp();
-            $this->output->writeln("New version of deployed files: {$version}");
-            $this->versionStorage->save($version);
-        }
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -205,17 +205,4 @@ private function getProcessesAmount()`
`205`	`205`	`{`
`206`	`206`	`return isset($this->options[Options::JOBS_AMOUNT]) ? (int)$this->options[Options::JOBS_AMOUNT] : 0;`
`207`	`207`	`}`
`208`		`-`
`209`		`- /**`
`210`		`- * Save version of deployed files`
`211`		`- * @return void`
`212`		`- */`
`213`		`- private function saveDeployedVersion()`
`214`		`- {`
`215`		`- if (!$this->idDryRun) {`
`216`		`- $version = (new \DateTime())->getTimestamp();`
`217`		`- $this->output->writeln("New version of deployed files: {$version}");`
`218`		`- $this->versionStorage->save($version);`
`219`		`- }`
`220`		`- }`
`221`	`208`	`}`