]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e572b4b ffb8c60)
Merge branch 'wip-msgauth4'
authorPeter Reiher <reiher@inktank.com>
Fri, 26 Oct 2012 16:25:15 +0000 (09:25 -0700)
committerPeter Reiher <reiher@inktank.com>
Fri, 26 Oct 2012 16:25:15 +0000 (09:25 -0700)
commita67afa4b09e00af0df6128453774f11022eb87dd
tree98b0bca551edf3f03fee123bd5a5562e8e6f12e4tree | snapshot
parente572b4b4cfb4468885718ea2d53f2458d4bee6c8commit | diff
parentffb8c605a8ae99cfa58bcfb66a23b9fa3a4d5e6dcommit | diff
Merge branch 'wip-msgauth4'

Conflicts:
src/common/config_opts.h
Added a couple of options related to session authentication, accepted new values for option from master
src/Makefile.am diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/mds/MDS.cc diff1 | diff2 | blob | history
src/mon/MonClient.cc diff1 | diff2 | blob | history
src/mon/MonClient.h diff1 | diff2 | blob | history
src/mon/Monitor.cc diff1 | diff2 | blob | history
src/mon/Monitor.h diff1 | diff2 | blob | history
src/msg/Pipe.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.