[Ipmitool-cvs] [SCM] ipmitool branch, master, updated. d6ca800da2cde1ecba0e4a9561b683607a6a9cb2

[Zdenek S. <st...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ipmitool".

The branch, master has been updated
       via  d6ca800da2cde1ecba0e4a9561b683607a6a9cb2 (commit)
      from  8fe8a5c74cab319c8d41d23789221fe90c906d22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d6ca800da2cde1ecba0e4a9561b683607a6a9cb2
Author: Dong Debin <deb...@no...>
Date:   Sun Mar 20 20:00:15 2016 +0200

    ID:430 - Change Nokia Siemens Networks to Nokia Solutions and Networks

diff --git a/include/ipmitool/ipmi.h b/include/ipmitool/ipmi.h
index b680f00..e978bfc 100644
--- a/include/ipmitool/ipmi.h
+++ b/include/ipmitool/ipmi.h
@@ -297,7 +297,7 @@ typedef enum IPMI_OEM {
      IPMI_OEM_AMI        = 20974,
      /* 24339 for [ADLINK TECHNOLOGY INC.] */
      IPMI_OEM_ADLINK_24339 = 24339,
-     IPMI_OEM_NOKIA_SIEMENS_NETWORKS = 28458,
+     IPMI_OEM_NOKIA_SOLUTIONS_AND_NETWORKS = 28458,
      IPMI_OEM_SUPERMICRO_47488 = 47488
 } IPMI_OEM;
 
diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c
index e9fba29..7fefee9 100644
--- a/lib/ipmi_strings.c
+++ b/lib/ipmi_strings.c
@@ -64,7 +64,7 @@ const struct valstr ipmi_oem_info[] = {
    { IPMI_OEM_TOSHIBA,                "Toshiba" },
    { IPMI_OEM_HITACHI_116,            "Hitachi" },
    { IPMI_OEM_HITACHI_399,            "Hitachi" },
-   { IPMI_OEM_NOKIA_SIEMENS_NETWORKS, "Nokia Siemens Networks" },
+   { IPMI_OEM_NOKIA_SOLUTIONS_AND_NETWORKS, "Nokia Solutions and Networks (formerly 'Nokia Siemens Networks')" },
    { IPMI_OEM_BULL,                   "Bull Company" },
    { IPMI_OEM_PPS,                    "Pigeon Point Systems" },
    { IPMI_OEM_BROADCOM,               "Broadcom Corporation" },

-----------------------------------------------------------------------

Summary of changes:
 include/ipmitool/ipmi.h |    2 +-
 lib/ipmi_strings.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
ipmitool