]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ea4562 42b7af6)
Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable
authorGreg Farnum <gregf@hq.newdream.net>
Fri, 8 Jan 2010 01:15:39 +0000 (17:15 -0800)
committerGreg Farnum <gregf@hq.newdream.net>
Fri, 8 Jan 2010 01:15:39 +0000 (17:15 -0800)
commit0775c74d77a5f3a59282162bd8b146638fdf43cd
tree4f4cb3bd04a899a897ba76ad522eba52aa80e575tree | snapshot
parent9ea4562960d2ef56c887dd40cf1df9d7f7adfda2commit | diff
parent42b7af6f9d155547a6568e51d2912892d5f9bdd2commit | diff
Merge branch 'unstable' of ceph.newdream.net:/git/ceph into unstable

Conflicts:

src/msg/SimpleMessenger.cc
src/msg/SimpleMessenger.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.