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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 676ce2a 47f0a52)

author	Sage Weil <sage@redhat.com>
	Fri, 19 Dec 2014 15:45:02 +0000 (07:45 -0800)
committer	Sage Weil <sage@redhat.com>
	Fri, 19 Dec 2014 15:45:02 +0000 (07:45 -0800)
commit	0a25bee53951bbac3cadbcccbc59068342e166e8
tree	dbc95588385e5421f56751196e2658c31bfa25b1	tree \| snapshot
parent	676ce2a58e140d7c9b90eb688136ab968166634c	commit \| diff
parent	47f0a52e85fd40d975edc90ca9ec49eba6769d98	commit \| diff

Merge remote-tracking branch 'gh/wip-fs-quota'

Conflicts:
src/client/Client.cc

src/ceph_mds.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	diff1 \|	diff2 \|	blob \| history
src/client/Inode.h	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mds/MDCache.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Migrator.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	diff1 \|	diff2 \|	blob \| history
src/mds/Server.h	diff1 \|	diff2 \|	blob \| history
src/msg/Message.h	diff1 \|	diff2 \|	blob \| history

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