Merge remote-tracking branch 'gh/kraken'

# Conflicts:
#	src/os/bluestore/BlueStore.cc

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
index 54dd77f8b10cd17ea00a58791fd1ab56ac52b247,2ca7882085dbd122abc1fb1ba8802442a256793a..a4acb10b0f82ddf5a9ed78819900f0ee89aaf52e
--- 1/src/os/bluestore/BlueStore.cc
--- 2/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -1681,10 -1661,7 +1681,9 @@@ bool BlueStore::ExtentMap::update(KeyVa
          }
        assert(p->shard_info->offset == p->offset);
        p->shard_info->bytes = len;
-       p->shard_info->extents = nn;
 -      t->set(PREFIX_OBJ, p->key, bl);
 +        
 +        encoded_shards[pos].key = &p->key;
 +        dirty_shards.push_back(encoded_shards[pos]);
        p->dirty = false;
        }
        p = n;