git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

author	Samuel Just <sam.just@inktank.com>
	Fri, 27 Jun 2014 17:54:23 +0000 (10:54 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 27 Jun 2014 17:54:23 +0000 (10:54 -0700)
commit	f48a0333eb748bc900b1235bca60f02822ab5ef1
tree	21a81ed9566028bc04ce6a96b508216845def58d	tree \| snapshot
parent	d72eec0341e02881229d0e4ffeafcae92eb33fb6	commit \| diff
parent	94e1b7762477d8216becb650345343da4efb6250	commit \| diff

Merge remote-tracking branch 'upstream/master' into wip-7999-master

Conflicts:
src/os/KeyValueStore.h

Unnamed repository; edit this file 'description' to name the repository.