From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 17 Nov 2010 18:26:37 +0000 (-0800)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c01aac4481a32bc7516c795e8f4595ff0cf349dd;p=~shefty%2Fibacm.git

refresh
---

diff --git a/meta b/meta
index 8c785a4..14c90bb 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 26ab95526844c090fdfd40749f244ee84143554f
-Head: 1cf329ef7af539681e9d6ce7be0be0aaec734e27
+Previous: e96374f363333acc45749ac865475c9e5662da0f
+Head: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
-  loop: 52204466a0e65232e946974a23887aefc9454d59
-  refresh-temp: 1cf329ef7af539681e9d6ce7be0be0aaec734e27
+  loop: 1e219f58eafc1fb4f035e67e90d88b5b69d44c16
 Unapplied:
 Hidden:
diff --git a/patches/loop b/patches/loop
index 46ddc6c..bfccd01 100644
--- a/patches/loop
+++ b/patches/loop
@@ -1,5 +1,5 @@
 Bottom: 586b39cacd2b705239045da946e474cb11840ae8
-Top:    0223e94f89da40cdfe65dac4e8ada06d3874b90d
+Top:    7fffdf6024c787b6b6d1c93dd896c4818d9d1169
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-16 10:39:24 -0800
 
@@ -43,7 +43,7 @@ index 3dbb0c6..65faac9 100644
  # TCP port number that the server listens on.
  # If this value is changed, then a corresponding change is required for
 diff --git a/src/acm.c b/src/acm.c
-index 77194ff..1981878 100644
+index 77194ff..099518e 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -69,6 +69,12 @@ enum acm_route_prot
@@ -149,6 +149,14 @@ index 77194ff..1981878 100644
  		else if (!stricmp("server_port", opt))
  			server_port = (short) atoi(value);
  		else if (!stricmp("timeout", opt))
+@@ -2627,6 +2688,7 @@ static void acm_log_options(void)
+ 	acm_log(0, "log level %d\n", log_level);
+ 	acm_log(0, "address resolution %d\n", addr_prot);
+ 	acm_log(0, "route resolution %d\n", route_prot);
++	acm_log(0, "loopback resolution %d\n", loopback_prot);
+ 	acm_log(0, "server_port %d\n", server_port);
+ 	acm_log(0, "timeout %d ms\n", timeout);
+ 	acm_log(0, "retries %d\n", retries);
 diff --git a/src/acme.c b/src/acme.c
 index e03679f..b54738e 100644
 --- a/src/acme.c
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index c08e082..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 0223e94f89da40cdfe65dac4e8ada06d3874b90d
-Top:    7fffdf6024c787b6b6d1c93dd896c4818d9d1169
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-17 10:26:37 -0800
-
-Refresh of loop
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index 1981878..099518e 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2688,6 +2688,7 @@ static void acm_log_options(void)
- 	acm_log(0, "log level %d\n", log_level);
- 	acm_log(0, "address resolution %d\n", addr_prot);
- 	acm_log(0, "route resolution %d\n", route_prot);
-+	acm_log(0, "loopback resolution %d\n", loopback_prot);
- 	acm_log(0, "server_port %d\n", server_port);
- 	acm_log(0, "timeout %d ms\n", timeout);
- 	acm_log(0, "retries %d\n", retries);