Merge branch 'master' of git://github.com/stephenpope/SolrNet.git

Conflicts: AutofacContrib.SolrNet/SolrNetModule.cs
ushipTomLaZelle · Dec 22, 2012 · 2204150 · 2204150
2 parents 61cdcae + f35a97a
commit 2204150
Show file tree

Hide file tree

Showing 5 changed files with 384 additions and 372 deletions.
diff --git a/AutofacContrib.SolrNet/SolrNetModule.cs b/AutofacContrib.SolrNet/SolrNetModule.cs
@@ -93,7 +93,9 @@ private void RegisterCommonComponents(ContainerBuilder builder) {
             builder.RegisterGeneric(typeof(SolrQueryExecuter<>)).As(typeof(ISolrQueryExecuter<>));
             builder.RegisterGeneric(typeof (SolrDocumentSerializer<>)).As(typeof (ISolrDocumentSerializer<>));
             builder.RegisterType<SolrDIHStatusParser>().As<ISolrDIHStatusParser>();
-            builder.RegisterType<MappingValidator>().As<IMappingValidator>();            
+            builder.RegisterType<MappingValidator>().As<IMappingValidator>();
+            builder.RegisterType<SolrStatusResponseParser>().As<ISolrStatusResponseParser>();
+            builder.RegisterType<SolrCoreAdmin>().As<ISolrCoreAdmin>();
             builder.RegisterType<SolrDictionarySerializer>().As<ISolrDocumentSerializer<Dictionary<string, object>>>();
             builder.RegisterType<SolrDictionaryDocumentResponseParser>().As<ISolrDocumentResponseParser<Dictionary<string, object>>>();
         }