From 3dea3edcb044dbbff148d5a7690852369b1aaeca Mon Sep 17 00:00:00 2001
From: Jeya ganesh babu J <jjeya@juniper.net>
Date: Tue, 30 Jun 2015 13:48:31 -0700
Subject: [PATCH] storage package fix merge

Closes-Bug: #1450827
Issue: Issue was seen in Ganges cluster where some of the osds
    get stuck in peering process.
Fix: Pulled in the latest Giant patch which has the peering fix

Change-Id: I1841bc2a90292a3be8b096ac0dec589c71af4014
---
 .../ubuntu1204/icehouse/depends_packages.cfg  | 12 +++----
 .../icehouse/depends_storage_packages.cfg     | 32 +++++++++++--------
 .../ubuntu1404/icehouse/depends_packages.cfg  | 16 ++++++----
 .../icehouse/depends_storage_packages.cfg     | 32 +++++++++++--------
 4 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg
index 911860a79..0538f4934 100644
--- a/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg
+++ b/build/package_configs/ubuntu1204/icehouse/depends_packages.cfg
@@ -732,13 +732,13 @@ md5   = 942635f76ab6cf1e27c6622201690bed
 file  = librabbitmq1_0.4.1-1~cloud0_amd64.deb
 md5   = 6df124d855bc5f51cba437762c07aa69
 
-[librados2_0.87-1_amd64]
-file  = librados2_0.87-1_amd64.deb
-md5   = abe5eabd39c963b4a0d641a7463fb1be
+[librados2_0.87.2-1]
+file  = librados2_0.87.2-1_amd64.deb
+md5   = 79960c9be25951ee9c8bcf10b2c48864
 
-[librbd1_0.87-1_amd64]
-file  = librbd1_0.87-1_amd64.deb
-md5   = 3d86412ea9a70eb952ab579f069c849d
+[librbd1_0.87.2-1]
+file  = librbd1_0.87.2-1_amd64.deb
+md5   = 408d1689c0c557bf06660be86e50682e
 
 [libsctp1_1.0.11+dfsg-2]
 file  = libsctp1_1.0.11+dfsg-2_amd64.deb
diff --git a/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg
index 2916b306c..5879aa3cc 100644
--- a/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg
+++ b/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg
@@ -17,32 +17,32 @@ location     =
 package_type = contrail-storage-packages
 
 [ceph-mds]
-file  = ceph-mds_0.87-1_amd64.deb
-md5   = 36c0a6897e7d45cf4220b95cd2cab248
+file  = ceph-mds_0.87.2-1_amd64.deb
+md5   = 722752dd23a93a6154ef35687a5487fd
 
 [libcephfs1]
-file  = libcephfs1_0.87-1_amd64.deb
-md5   = d9cae5564dd5d83ca09506b7bd38d98e
+file  = libcephfs1_0.87.2-1_amd64.deb
+md5   = a1c458253ad6fa420c1dfe3fbb99f1b9
 
 [ceph-fs-common]
-file  = ceph-fs-common_0.87-1_amd64.deb
-md5   = 0ea3999d402a1113e89327733e4c955b
+file  = ceph-fs-common_0.87.2-1_amd64.deb
+md5   = 60501505cf6d739e006bfa55da49bdd4
 
 [ceph]
-file  = ceph_0.87-2_amd64.deb
-md5   = 59f1093ff4bf6845b39e181b19dbd226
+file  = ceph_0.87.2-1_amd64.deb
+md5   = bcfd49082e621cc77bc2f6a847fd79a8
 
 [ceph-fuse]
-file  = ceph-fuse_0.87-1_amd64.deb
-md5   = 9b2b596312ee0bc822e2292289197d15
+file  = ceph-fuse_0.87.2-1_amd64.deb
+md5   = 60aa813007d55f34a461b1062c6c2c64
 
 [ceph-common]
-file  = ceph-common_0.87-1_amd64.deb
-md5   = 215667ac5fe878b18c070b8881254375
+file  = ceph-common_0.87.2-1_amd64.deb
+md5   = 695ab87e5b95df962765cb4b16b8317e
 
 [python-ceph]
-file  = python-ceph_0.87-1_amd64.deb
-md5   = 2d60c3a49e4fbd397364e5727e996418
+file  = python-ceph_0.87.2-1_amd64.deb
+md5   = 84024577f36f9bd5b4246b58b57ca889
 
 [libgssglue1]
 file  = libgssglue1_0.3-4ubuntu0.1_amd64.deb
@@ -191,3 +191,7 @@ md5   = 853046781d2df32a8a9ba7d82d5df31a
 [cinder-volume]
 file = cinder-volume_2014.1.3-0ubuntu1~cloud0_all.deb
 md5   = e9903afd04153be70c5baafbf643387b
+
+[libreadline5]
+file  = libreadline5_5.2-11_amd64.deb
+md5   = 7f1a5bc806abf015dc11fb597b6ab67c
diff --git a/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg
index e6bf8f329..c0e472090 100644
--- a/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg
+++ b/build/package_configs/ubuntu1404/icehouse/depends_packages.cfg
@@ -824,13 +824,17 @@ md5   = 942635f76ab6cf1e27c6622201690bed
 file  = librabbitmq1_0.4.1-1_amd64.deb
 md5   = 59f733e1342ff743039cec1d6305fc2c
 
-[librados2_0.87-1]
-file  = librados2_0.87-1_amd64.deb
-md5   = 34a8d90469ad4d6ad0135f80d4ef006d
+[libcrypto++9]
+file           = libcrypto++9_5.6.1-6_amd64.deb
+md5            = be261df24d1f96cbef9fbc9c832c4f33
 
-[librbd1_0.87-1]
-file  = librbd1_0.87-1_amd64.deb
-md5   = b97ab2e9c51b548e0db7952f55adafcb
+[librados2_0.87.2-1]
+file  = librados2_0.87.2-1_amd64.deb
+md5   = 64edb9970d7dd94e5b14fbd05c5f1cfb
+
+[librbd1_0.87.2-1]
+file  = librbd1_0.87.2-1_amd64.deb
+md5   = af3cd4feb3b8dc6ed5d54d00eca93762
 
 [libsctp1_1.0.15+dfsg-1]
 file  = libsctp1_1.0.15+dfsg-1_amd64.deb
diff --git a/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg
index 243c506a1..eeb6147d3 100644
--- a/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg
+++ b/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg
@@ -17,32 +17,32 @@ location     =
 package_type = contrail-storage-packages
 
 [libcephfs1]
-file  = libcephfs1_0.87-1_amd64.deb
-md5   = 732508f16384c3af23f0353851dc2caf
+file  = libcephfs1_0.87.2-1_amd64.deb
+md5   = 1c0530be5a968b15ef0154967e6d28f7
 
 [ceph]
-file  = ceph_0.87-2_amd64.deb
-md5   = 43f6fe722730bfd4d1b66b6b3d569d0a
+file  = ceph_0.87.2-1_amd64.deb
+md5   = 834d15a55d38053ac0616347a8b890ad
 
 [ceph-common]
-file  = ceph-common_0.87-1_amd64.deb
-md5   = 039b4e72e5d756cdfccfe95f0bafd20f
+file  = ceph-common_0.87.2-1_amd64.deb
+md5   = a015581736861d6fa043b244f942989b
 
 [python-ceph]
-file  = python-ceph_0.87-1_amd64.deb
-md5   = 8c1848ef1454175693b1f401c90c841a
+file  = python-ceph_0.87.2-1_amd64.deb
+md5   = 706df3e3ecda0f7eb6aa196753c87c53
 
 [ceph-mds]
-file  = ceph-mds_0.87-1_amd64.deb
-md5   = cdfa2aa24ad795b4befa15e72d27e67a
+file  = ceph-mds_0.87.2-1_amd64.deb
+md5   = 9be76d2c16c27bb550a7aa9e9c417d48
 
 [ceph-fuse]
-file  = ceph-fuse_0.87-1_amd64.deb
-md5   = 1e56117924a9d6c1493698bb922e8394
+file  = ceph-fuse_0.87.2-1_amd64.deb
+md5   = ad9ddbb6c378350bca29f079406ccb12
 
 [ceph-fs-common]
-file  = ceph-fs-common_0.87-1_amd64.deb
-md5   = de3b40d290ef0947ef7413d544a011e9
+file  = ceph-fs-common_0.87.2-1_amd64.deb
+md5   = ebade33218c3d8770e765c846c3f39bd
 
 [libgssglue1]
 file  = libgssglue1_0.3-4ubuntu0.1_amd64.deb
@@ -220,6 +220,10 @@ md5   = e69af23a733d56e13072fd5b8689892d
 file  = liblzo2-2_2.06-1.2ubuntu1.1_amd64.deb
 md5   = b3e9733843fda9b2463a0745e7306092
 
+[libreadline5]
+file  = libreadline5_5.2+dfsg-2_amd64.deb
+md5   = 105690417cc22d06a1c4a66069ec8a91
+
 [guile-2.0-libs]
 file  = guile-2.0-libs_2.0.9+1-1ubuntu1_amd64.deb
 md5   = 040cc4de4acdd5c233c841a437a4ec06