]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wannoying2'
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 4 Feb 2011 17:47:29 +0000 (09:47 -0800)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Fri, 4 Feb 2011 17:47:29 +0000 (09:47 -0800)
commita87a3c116c23c13c15be3a090e87270e53acdd3e
treea0375c5524c25133e7bcbe3c0353869b6f7efb8a
parentb75846e5d9983bd25435e33795e4b615354c2cab
parenta2abe5f53cdc892b49c6f4e53680cf0a704c955a
Merge branch 'wannoying2'

Conflicts:
src/os/FileJournal.cc
src/os/FileJournal.cc
src/os/FileStore.cc