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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ad8a0d9 3be64f1)

author	Sage Weil <sage@newdream.net>
	Mon, 13 Sep 2010 16:24:47 +0000 (09:24 -0700)
committer	Sage Weil <sage@newdream.net>
	Mon, 13 Sep 2010 16:24:47 +0000 (09:24 -0700)
commit	9aa4e8204cea90771042e4fb6280a925f8fc5601
tree	f133f45a21bd615d95a20f2a196d42a076e7681c	tree \| snapshot
parent	ad8a0d9b364ce4c1e3ac0b0f29d23a135f53a37e	commit \| diff
parent	3be64f1fe9364c6df2eef25336066f3f08577cbc	commit \| diff

Merge branch 'testing' into unstable

Conflicts:
src/mon/ClassMonitor.cc
src/mon/Session.h

src/common/ConfUtils.cc	diff1 \|	diff2 \|	blob \| history
src/config.cc	diff1 \|	diff2 \|	blob \| history
src/mon/AuthMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/ClassMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Session.h	diff1 \|	diff2 \|	blob \| history
src/os/FileStore.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	diff1 \|	diff2 \|	blob \| history

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