Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Sun, 28 Jul 2013 23:17:55 +0000 (16:17 -0700)

committer Sage Weil <sage@inktank.com>

Sun, 28 Jul 2013 23:17:55 +0000 (16:17 -0700)
author Sage Weil <sage@inktank.com>
Sun, 28 Jul 2013 23:17:55 +0000 (16:17 -0700)
committer Sage Weil <sage@inktank.com>
Sun, 28 Jul 2013 23:17:55 +0000 (16:17 -0700)
diff --cc PendingReleaseNotes
Simple merge
diff --cc debian/control
Simple merge
diff --cc src/ceph.in
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
diff --cc src/pybind/ceph_argparse.py
Simple merge
author	Sage Weil <sage@inktank.com>
	Sun, 28 Jul 2013 23:17:55 +0000 (16:17 -0700)
committer	Sage Weil <sage@inktank.com>
	Sun, 28 Jul 2013 23:17:55 +0000 (16:17 -0700)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
src/ceph.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/ceph_argparse.py	patch \|	diff1 \|	diff2 \|	blob \| history