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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 21a1c4d 1cb7dbd)

author	Dan Mick <dan.mick@inktank.com>
	Tue, 4 Jun 2013 20:12:08 +0000 (13:12 -0700)
committer	Dan Mick <dan.mick@inktank.com>
	Tue, 4 Jun 2013 20:12:08 +0000 (13:12 -0700)
commit	ee0913c2e6427093a0bf9dbe9cc536968be7667e
tree	9e9e9981096181caf66b9f479bcb68a1dfe525f7	tree \| snapshot
parent	21a1c4d39ca5e7c2ff63590eef3e1f134bfec9ec	commit \| diff
parent	1cb7dbd94ab686987d1ef6e58a5f7a9406a3d477	commit \| diff

Merge remote-tracking branch 'origin/master' into wip-ceph-cli

Conflicts:
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/ReplicatedPG.cc

12 files changed:

debian/control	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/mon/ConfigKeyService.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MonClient.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	diff1 \|	diff2 \|	blob \| history
src/mon/MonmapMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/test/encoding/types.h	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	diff1 \|	diff2 \|	blob \| history

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