Merge branch '1.0.x'

Author: mhowlett

examples/AvroBlogExamples/Program.cs

@@ -16,7 +16,6 @@
 
 using Avro.Generic;
 using Confluent.Kafka;
-using Confluent.Kafka.Serdes;
 using Confluent.SchemaRegistry.Serdes;
 using Confluent.SchemaRegistry;
 using System;

examples/Consumer/Program.cs

@@ -16,7 +16,6 @@
 //
 // Refer to LICENSE for more information.
 
-using Confluent.Kafka.Serdes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -53,7 +52,7 @@ public static void Run_Consume(string brokerList, List<string> topics, Cancellat
             const int commitPeriod = 5;
 
             // Note: If a key or value deserializer is not set (as is the case below), the 
-            // deserializer corresponding to the appropriate type from Confluent.Kafka.Serdes
+            // deserializer corresponding to the appropriate type from Confluent.Kafka.Deserializers
             // will be used automatically (where available). The default deserializer for string
             // is UTF8. The default deserializer for Ignore returns null for all input data
             // (including non-null data).

examples/Protobuf/Program.cs

@@ -17,7 +17,6 @@
 // Refer to LICENSE for more information.
 
 using Confluent.Kafka;
-using Confluent.Kafka.Serdes;
 using Google.Protobuf;
 using System;
 using System.Threading;

src/Confluent.Kafka/Consumer.cs

@@ -24,7 +24,6 @@
 using System.Threading.Tasks;
 using Confluent.Kafka.Impl;
 using Confluent.Kafka.Internal;
-using Confluent.Kafka.Serdes;
 
 
 namespace Confluent.Kafka

src/Confluent.Kafka/Deserializers.cs

@@ -18,7 +18,7 @@
 using System.Text;
 
 
-namespace Confluent.Kafka.Serdes
+namespace Confluent.Kafka
 {
     /// <summary>
     ///     Deserializers for use with <see cref="Consumer{TKey,TValue}" />.

src/Confluent.Kafka/Producer.cs

@@ -20,7 +20,6 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Confluent.Kafka.Serdes;
 using Confluent.Kafka.Impl;
 using Confluent.Kafka.Internal;
 

src/Confluent.Kafka/Serializers.cs

@@ -18,7 +18,7 @@
 using System.Text;
 
 
-namespace Confluent.Kafka.Serdes
+namespace Confluent.Kafka
 {
     /// <summary>
     ///     Serializers for use with <see cref="Producer{TKey,TValue}" />.

test/Confluent.Kafka.IntegrationTests/Tests/AssignPastEnd.cs

@@ -19,7 +19,6 @@
 using System;
 using System.Collections.Generic;
 using Xunit;
-using Confluent.Kafka.Serdes;
 
 
 namespace Confluent.Kafka.IntegrationTests

test/Confluent.Kafka.IntegrationTests/Tests/Consumer_DisableHeaders.cs

@@ -16,7 +16,6 @@
 
 #pragma warning disable xUnit1026
 
-using Confluent.Kafka.Serdes;
 using System;
 using Xunit;
 

test/Confluent.Kafka.IntegrationTests/Tests/Consumer_DisableTimestamps.cs

@@ -16,7 +16,6 @@
 
 #pragma warning disable xUnit1026
 
-using Confluent.Kafka.Serdes;
 using System;
 using Xunit;