]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/stable' into next
authorSage Weil <sage@newdream.net>
Wed, 22 Jun 2011 17:09:48 +0000 (10:09 -0700)
committerSage Weil <sage@newdream.net>
Wed, 22 Jun 2011 17:09:48 +0000 (10:09 -0700)
commit0fe6a15d7ba86fe74586eff12bc24a03f1560c51
tree96f59ce4d54eba77432a91d78fe0c7da7dbea2a8
parent1635bff4a9623a42b18837b116b364779a114a7b
parente214420518914b2856e88e27456cd107db3f6166
Merge remote branch 'origin/stable' into next

Conflicts:
src/librbd.cc
src/librbd.cc