]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' into rgw
authorYehuda Sadeh <yehuda@hq.newdream.net>
Mon, 21 Mar 2011 21:14:38 +0000 (14:14 -0700)
committerYehuda Sadeh <yehuda@hq.newdream.net>
Mon, 21 Mar 2011 21:14:38 +0000 (14:14 -0700)
commit44cf2820387f44decaac1b51e6087787e0e668bf
tree7c4b5fd6dcd480ab34438ba46bae888ed34c5196
parentb708307f7d2c1a515405f8dcd341fe5371c522d4
parentffdc995a4705884e9b18b60ee3149bba49acfa8e
Merge branch 'master' into rgw

Conflicts:

debian/control
configure.ac
debian/control
src/Makefile.am
src/librados.cc