SERVER-18049 Put ShardRegistry on Grid

Gets rid of the static shard registry instance and instead places it on
the instance-wide Grid object.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/mongo/s/grid.h b/src/mongo/s/grid.h
index eb344a34392..cbaf37a783c 100644
--- a/src/mongo/s/grid.h
+++ b/src/mongo/s/grid.h
@@ -41,6 +41,7 @@ namespace mongo {
     class CatalogManager;
     class DBConfig;
     class SettingsType;
+    class ShardRegistry;
     template<typename T> class StatusWith;
 
 
@@ -86,10 +87,12 @@ namespace mongo {
 
         CatalogManager* catalogManager() const { return _catalogManager.get(); }
         CatalogCache* catalogCache() const { return _catalogCache.get(); }
+        ShardRegistry* shardRegistry() const { return _shardRegistry.get(); }
 
     private:
         std::unique_ptr<CatalogManager> _catalogManager;
         std::unique_ptr<CatalogCache> _catalogCache;
+        std::unique_ptr<ShardRegistry> _shardRegistry;
 
         // can 'localhost' be used in shard addresses?
         bool _allowLocalShard;