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: 805b6cb fa77429)

author	Sage Weil <sage@newdream.net>
	Wed, 21 Oct 2009 23:23:37 +0000 (16:23 -0700)
committer	Sage Weil <sage@newdream.net>
	Wed, 21 Oct 2009 23:23:37 +0000 (16:23 -0700)
commit	5e7efba63f05c46dd4bc9a51aec74f1b21af86bb
tree	ba20efaca07380718cc8255d64d2e568771a1a89	tree \| snapshot
parent	805b6cbed070cbd870e2ac52c1494834ece81e2f	commit \| diff
parent	fa7742927afd665bd5e50493eb5c706a58c5b2a0	commit \| diff

Merge branch 'auth' of ceph.newdream.net:git/ceph into auth

Conflicts:
src/Makefile.am
src/auth/AuthorizeServer.h
src/mon/Monitor.cc

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	diff1 \|	diff2 \|	blob \| history

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