RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source
This commit is contained in:
Sage Weil 2012-06-17 14:00:02 -07:00
commit 10c57b5ad2
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/control vendored
View File

@ -1,7 +1,7 @@
Source: ceph
Section: admin
Priority: optional
Homepage: http://ceph.newdream.net/
Homepage: http://ceph.com/
Vcs-Git: git://github.com/ceph/ceph.git
Vcs-Browser: https://github.com/ceph/ceph
Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
@ -272,7 +272,7 @@ Description: synchronize data between cloud object storage providers or a local
Package: python-ceph
Architecture: amd64 armel armhf i386 ia64 mipsel
Section: python
Depends: ${python:Depends}, librados2, librbd1
Depends: ${misc:Depends}, ${python:Depends}, librados2, librbd1
Description: Python libraries for the Ceph distributed filesystem
Ceph is a distributed storage and network file system designed to provide
excellent performance, reliability, and scalability.

2
src/cls_rbd.cc
View File

@ -797,7 +797,7 @@ int snapshot_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
::decode(old_meta, iter);
} catch (const buffer::error &err) {
snapid_t snap_id = snap_id_from_key(it->first);
CLS_ERR("error decoding snapshot metadata for snap_id: %llu", snap_id);
CLS_ERR("error decoding snapshot metadata for snap_id: %llu", snap_id.val);
return -EIO;
}
if (snap_meta.name == old_meta.name || snap_meta.id == old_meta.id) {

2
src/msg/msg_types.cc
View File

@ -69,7 +69,7 @@ bool entity_addr_t::parse(const char *s, const char **end)
}
*o = 0;
char buf6[39];
char buf6[64]; // actually 39 + null is sufficient.
o = buf6;
p = start;
while (o < buf6 + sizeof(buf6) &&

3
src/os/FileStore.cc
View File

@ -4410,7 +4410,8 @@ int FileStore::list_collections(vector<coll_t>& ls)
}
} else if (de->d_type != DT_DIR) {
continue;
} else if (strcmp(de->d_name, "omap") == 0) {
}
if (strcmp(de->d_name, "omap") == 0) {
continue;
}
if (de->d_name[0] == '.' &&

1
src/test/test_addrs.cc
View File

@ -32,6 +32,7 @@ const char *addr_checks[][3] = {
{ "[2607:f298:4:2243::5522]a", "[2607:f298:4:2243::5522]:0/0", "a" },
{ "[2607:f298:4:2243::5522]:1234a", "[2607:f298:4:2243::5522]:1234/0", "a" },
{ "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "[2001:db8:85a3::8a2e:370:7334]:0/0", "" },
{ "2001:2db8:85a3:4334:4324:8a2e:1370:7334", "[2001:2db8:85a3:4334:4324:8a2e:1370:7334]:0/0", "" },
{ "::", "[::]:0/0", "" },
{ "::zz", "[::]:0/0", "zz" },
{ ":: 12:34", "[::]:0/0", " 12:34" },