mailmap: Thorsten Behrens affiliation

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Luis Pabón affiliation

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Xiaoxi Chen affiliation

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Huamin Chen affiliation

and name normalization

Reviewed-by: Huamin Chen <hchen@redhat.com>
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Zhiqiang Wang affiliation

and name normalization

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Pavan Rallabhandi affiliation

Reviewed-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Andreas Peters name normalization

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
mailmap: Owen Synge affiliation

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
Merge pull request #2010 from ceph/wip-misplaced

osd: track misplaced objects separately from degraded objects

Reviewed-by: Samuel Just <sam.just@inktank.com>
qa/workunits/rbd/qemu-iotests: touch common.env

This seems to be necessary on trusty.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/hadoop-wordcount: use -x

Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/hadoop-wordcount: fix/use -rmr command

-rm -r -f ... doesn't seem to work; use -rmr instead.

Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/hadoop: move all hadoop tests into a hadoop/ dir

Signed-off-by: Sage Weil <sage@redhat.com>
qa/workunits/rbd/qemu-iotests: touch common.env

This seems to be necessary on trusty.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 055be68cf8e1b84287ab3631a02e89a9f3ae6cca)
0.84
ceph_mon: check for existing mon store before opening db

This will make sure that the monitor data directory is populated before
proceeding to opening it up.  We have to do this in order to work around
leveldb, which will create 'store.db' (even though it won't populate it)
upon opening the database.  Unwillingly, running the monitor without
first issuing a mkfs would have us ending up with a 'store.db' in the
monitor's data directory, and later on we would get errors from the
monitor not finding magic values within the store -- which given mkfs
hadn't been run isn't surprising.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
doc: add notes on using "ceph fs new"

Signed-off-by: John Spray <john.spray@redhat.com>
Merge pull request #2280 from ceph/wip-fs-docs

doc: add notes on using "ceph fs new"

Reviewed-by: Sage Weil <sage@redhat.com>
doc/release-notes: v0.84

Signed-off-by: Sage Weil <sage@redhat.com>
doc: Move wireshark documentation to dev.

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