Merge pull request #2365 from infernix/centos5

Include types.h after stdint.h to accommodate for older distributions. 

Reviewed-by: Loic Dachary <loic-201408@dachary.org>
Merge pull request #2404 from ceph/wip-9358

osdc/Journaler: fix try_read_entry()/wait_for_readable() locking

Reviewed-by: John Spray <john.spray@redhat.com>
Merge pull request #2391 from ceph/wip-mds-lock

Wip mds lock

Reviewed-by: John Spray <john.spray@redhat.com>
Merge pull request #2395 from ceph/wip-9282

mds: warn clients which aren't revoking caps
0.85
mon/Paxos: don't spam log with is_readable at dout level 1

Backport: firefly, dumpling
Reported-by: Aanchal Agrawal <Aanchal.Agrawal@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
mon/Paxos: make is_readable debug output show result

Signed-off-by: Sage Weil <sage@redhat.com>
lttng: Fix 'make tag' when configured --without-lttng

Signed-off-by: Adam Crume <adamcrume@gmail.com>
Merge pull request #2421 from ceph/wip-paxos-dout

mon/Paxos: don't spam log with is_readable at dout level 1

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
doc: Clean up syntax.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
doc: Clean up syntax to suppress warnings.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
doc: Added more robust usage example for uid and conf for QEMU.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
doc/release-notes: v0.85

Signed-off-by: Sage Weil <sage@redhat.com>
Merge remote-tracking branch 'gh/next'
Merge pull request #2426 from ceph/wip-doc-qemu

doc: Added more robust usage example for uid and conf for QEMU.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Merge pull request #2390 from ceph/wip-9311

Parallelize RBD import/export

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
debian: only B-R yasm on amd64

Make yasm dependency amd64 only, it isn?t used elsewhere
but breaks x32 (which is mis-detected as amd64)

Signed-off-by: Sage Weil <sage@redhat.com>
Merge pull request #2424 from ceph/wip-9366

lttng: Fix 'make tag' when configured --without-lttng
doc: Minor cleanup.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
doc: Fixed broken links and clarified terms for new authentication docs.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>