refresh

diff --git a/meta b/meta
index 88a05e2fa456f480ea3a91d590218a42a8fb1a6b..af7e7acba4ed9f7fa05391b80ab909fb9c35188f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 3b85a2fe05195e8c29a6a88d8b9424a873a9ec69
-Head: c64ddd288e9f7ec6c98e6015a256830b20e2d228
+Previous: 52bab1ddaf12bc6c05914f3320e122eecbbd6912
+Head: e1b0fba3f12a5fd5d8c5e452a3db13258a5f5492
 Applied:
   bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878
   alias: cf8b034d082dbc168524cfadc86e231772254a64
-  counters: 78ec556f36798498ae7d006d7e4863086ac2c24e
-  refresh-temp: c64ddd288e9f7ec6c98e6015a256830b20e2d228
+  counters: e1b0fba3f12a5fd5d8c5e452a3db13258a5f5492
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/counters b/patches/counters
index 667ea32aed0db8ace38e72a4ac8a76eae2edabe5..24119ff35f31519fe1043b2111a4aa33b59ba221 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: c1a3265ecb373be6114f838a6a7b82453aafd16e
-Top:    18f2719edc4036be333ec659de94958283145b33
+Top:    0653de5313cba06c32bc24739dde481b5c68f185
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -302,7 +302,7 @@ index 1c643f3..fed0440 100644
        if (acm_open_devices()) {
                acm_log(0, "ERROR - unable to open any devices\n");
 diff --git a/src/acme.c b/src/acme.c
-index d42ba81..9bb6791 100644
+index d42ba81..6e4c32c 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -49,11 +49,13 @@ static char *opts_file = ACM_OPTS_FILE;
@@ -325,7 +325,7 @@ index d42ba81..9bb6791 100644
  static void show_usage(char *program)
  {
        printf("usage 1: %s\n", program);
-+      printf("Query specified ib_acm service for data\n")
++      printf("Query specified ib_acm service for data\n");
        printf("   [-f addr_format] - i(p), n(ame), l(id), g(gid), or u(nspecified)\n");
 -      printf("                      default: 'u'\n");
 -      printf("   [-s src_addr]    - format defined by -f option\n");
@@ -338,7 +338,7 @@ index d42ba81..9bb6791 100644
 +      printf("   [-P]             - query performance data from destination service");
 +      printf("   [-S svc_addr]    - address of ACM service, default: local service")
        printf("usage 2: %s\n", program);
-+      printf("Generate default ib_acm service configuration and option files\n")
++      printf("Generate default ib_acm service configuration and option files\n");
        printf("   -A [addr_file]   - generate local address configuration file\n");
        printf("                      (default is %s)\n", ACM_ADDR_FILE);
        printf("   -O [opt_file]    - generate local acm_opts.cfg options file\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4faf219..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 18f2719edc4036be333ec659de94958283145b33
-Top:    0653de5313cba06c32bc24739dde481b5c68f185
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-30 17:07:02 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 9bb6791..6e4c32c 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -69,7 +69,7 @@ extern char **parse(char *args, int *count);
- static void show_usage(char *program)
- {
-       printf("usage 1: %s\n", program);
--      printf("Query specified ib_acm service for data\n")
-+      printf("Query specified ib_acm service for data\n");
-       printf("   [-f addr_format] - i(p), n(ame), l(id), g(gid), or u(nspecified)\n");
-       printf("                      address format for -s and -d options, default: 'u'\n");
-       printf("   [-s src_addr]    - source address for path queries\n");
-@@ -79,7 +79,7 @@ static void show_usage(char *program)
-       printf("   [-P]             - query performance data from destination service");
-       printf("   [-S svc_addr]    - address of ACM service, default: local service")
-       printf("usage 2: %s\n", program);
--      printf("Generate default ib_acm service configuration and option files\n")
-+      printf("Generate default ib_acm service configuration and option files\n");
-       printf("   -A [addr_file]   - generate local address configuration file\n");
-       printf("                      (default is %s)\n", ACM_ADDR_FILE);
-       printf("   -O [opt_file]    - generate local acm_opts.cfg options file\n");