]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 888e880 112e569)
Merge branch 'wip-globalfoo'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 21 Jun 2011 19:28:44 +0000 (12:28 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 21 Jun 2011 19:28:44 +0000 (12:28 -0700)
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/Monitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.