From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Jul 2014 23:49:46 +0000 (-0700)
Subject: unittest_osdmap: revert a few broken changes
X-Git-Tag: v0.84~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad4a4e134603860a85b847bb3c37fa6809550de9;p=ceph.git

unittest_osdmap: revert a few broken changes

From commit 80ea6067f790b9431ae6744c38a034833e8ad4ab.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc
index 9c5ab6cc2e3a..bf809b81dba8 100644
--- a/src/test/osd/TestOSDMap.cc
+++ b/src/test/osd/TestOSDMap.cc
@@ -191,7 +191,7 @@ TEST_F(OSDMapTest, PrimaryTempRespected) {
   pg_t rawpg(0, 0, -1);
   pg_t pgid = osdmap.raw_pg_to_pg(rawpg);
   vector<int> up_osds;
-  vector<uint32_t> acting_osds;
+  vector<int> acting_osds;
   int up_primary, acting_primary;
 
   osdmap.pg_to_up_acting_osds(pgid, &up_osds, &up_primary,
@@ -213,7 +213,7 @@ TEST_F(OSDMapTest, RemovesRedundantTemps) {
   pg_t rawpg(0, 0, -1);
   pg_t pgid = osdmap.raw_pg_to_pg(rawpg);
   vector<int> up_osds, acting_osds;
-  int32_t up_primary, acting_primary;
+  int up_primary, acting_primary;
 
   osdmap.pg_to_up_acting_osds(pgid, &up_osds, &up_primary,
                               &acting_osds, &acting_primary);