From cf003c07fe1502fd9a0826a6770bcbd865e2b4d5 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <cspruiell@ebay.com>
Date: Tue, 15 Mar 2016 14:30:22 -0500
Subject: [PATCH] MAGETWO-50326: Merge and stabilize builds for bug fixes and
public PRs and SalesRuleStaging Doc
- update composer.lock
---
composer.lock | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/composer.lock b/composer.lock
index 0f4d3e2a226..b51da07b5ba 100644
--- a/composer.lock
+++ b/composer.lock
@@ -325,8 +325,8 @@
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/magento/composer/zipball/1be267e71debac6e0d9fae4e5144f6095cffbe89",
- "reference": null,
- "shasum": "79156c3e7317af1ff64a482ba90ec81c66b82c73"
+ "reference": "1be267e71debac6e0d9fae4e5144f6095cffbe89",
+ "shasum": ""
},
"require": {
"composer/composer": "1.0.0-alpha10",
@@ -342,11 +342,13 @@
"Magento\\Composer\\": "src"
}
},
+ "notification-url": "https://packagist.org/downloads/",
"license": [
"OSL-3.0",
"AFL-3.0"
],
- "description": "Magento composer library helps to instantiate Composer application and run composer commands."
+ "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
+ "time": "2015-10-01 14:39:10"
},
{
"name": "magento/magento-composer-installer",
@@ -430,12 +432,12 @@
"source": {
"type": "git",
"url": "https://github.com/magento/zf1.git",
- "reference": "dbdf178992bfa52d6e978e62131162301ff6b76f"
+ "reference": "c9d607bfd9454bc18b9deff737ccd5d044e2ab10"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/magento/zf1/zipball/c9d607bfd9454bc18b9deff737ccd5d044e2ab10",
- "reference": "dbdf178992bfa52d6e978e62131162301ff6b76f",
+ "reference": "c9d607bfd9454bc18b9deff737ccd5d044e2ab10",
"shasum": ""
},
"require": {
@@ -469,7 +471,7 @@
"ZF1",
"framework"
],
- "time": "2015-09-30 13:04:03"
+ "time": "2015-10-29 14:34:55"
},
{
"name": "monolog/monolog",
--
GitLab