Code changes for API and Rx API changes.

ribbon-examples/src/main/java/com/netflix/ribbon/examples/netty/http/SimpleGet.java

@@ -11,12 +11,11 @@ import java.util.concurrent.TimeUnit;
 import rx.functions.Action1;
 
 import com.netflix.client.netty.http.NettyHttpClient;
-import com.netflix.client.netty.http.NettyHttpClientBuilder;
 
 public class SimpleGet {
     @edu.umd.cs.findbugs.annotations.SuppressWarnings
     public static void main(String[] args) throws Exception {
-        NettyHttpClient client = NettyHttpClientBuilder.newBuilder().buildHttpClient();
+        NettyHttpClient<ByteBuf, ByteBuf> client = NettyHttpClient.createDefaultHttpClient();
         HttpClientRequest<ByteBuf> request = HttpClientRequest.createGet("/");
                 
         final CountDownLatch latch = new CountDownLatch(1);

ribbon-loadbalancer/src/main/java/com/netflix/utils/RxUtils.java

 package com.netflix.utils;
 
 import rx.Observable;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
 
 public class RxUtils {
 

ribbon-rxnetty/src/test/java/com/netflix/client/netty/NettyClientTest.java

@@ -38,6 +38,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -97,7 +99,7 @@ public class NettyClientTest {
             e.printStackTrace();
             fail("Unable to start server");
         }
-        // LogManager.getRootLogger().setLevel((Level)Level.DEBUG);
+        LogManager.getRootLogger().setLevel((Level)Level.DEBUG);
     }
     
     private static Observable<Person> getPersonObservable(Observable<HttpClientResponse<ByteBuf>> response) {