summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohini.deshpande <rohini.deshpande>2013-04-15 07:31:36 +0000
committerrohini.deshpande <rohini.deshpande>2013-04-15 07:31:36 +0000
commit6c0bc45c92df7dd000ed64aaf2cd3939526b376c (patch)
tree1642c3462afd94600fe9e9d6e5cd686e5bfe6c24
parent405894293746aabd724982251cc3cf09577d195b (diff)
downloadtog-pegasus-RELEASE_2_11-branch.zip
tog-pegasus-RELEASE_2_11-branch.tar.gz
tog-pegasus-RELEASE_2_11-branch.tar.xz
TITLE: set to Version 2.11.2 in 2.11-branch DESCRIPTION: Changed version to 2.11.2
-rw-r--r--env_var_HPUX.status2
-rw-r--r--env_var_Linux.status2
-rw-r--r--mak/version-windows.RC8
-rw-r--r--rpm/tog-pegasus.spec2
-rw-r--r--src/Clients/cimconfig/tests/result.master2
-rw-r--r--src/Clients/cimreparchive/tests/result.master2
-rw-r--r--src/Clients/cimsub/tests/testscript/result.master2
-rw-r--r--src/Clients/cimsub/tests/testscript/result.master.nocql2
-rw-r--r--src/Clients/wbemexec/tests/result.master2
-rw-r--r--src/Clients/wbemexec/tests/result.master.nossl2
-rw-r--r--src/Pegasus/Common/PegasusVersion.h4
-rw-r--r--src/Providers/TestProviders/CLITestProvider/tests/helpresult.master2
-rw-r--r--src/Providers/TestProviders/CLITestProvider/tests/helpresult.master.ssl2
13 files changed, 17 insertions, 17 deletions
diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index afaf468..8d085a7 100644
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -10,7 +10,7 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
PEGASUS_OVERRIDE_PRODUCT_ID=yes
PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.11.1"
+PEGASUS_PRODUCT_VERSION="2.11.2"
PEGASUS_PRODUCT_STATUS=""
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
diff --git a/env_var_Linux.status b/env_var_Linux.status
index 91787f6..40c3d85 100644
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -9,7 +9,7 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
PEGASUS_OVERRIDE_PRODUCT_ID=yes
PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.11.1"
+PEGASUS_PRODUCT_VERSION="2.11.2"
PEGASUS_PACKAGE_VERSION=1
PEGASUS_PRODUCT_STATUS=""
diff --git a/mak/version-windows.RC b/mak/version-windows.RC
index c6331c6..5f5cfff 100644
--- a/mak/version-windows.RC
+++ b/mak/version-windows.RC
@@ -2,8 +2,8 @@
1 VERSIONINFO
-FILEVERSION 2,11,1
-PRODUCTVERSION 2,11,1
+FILEVERSION 2,11,2
+PRODUCTVERSION 2,11,2
FILEFLAGSMASK 0x00
FILEFLAGS 0x00
FILEOS VOS__WINDOWS32
@@ -14,8 +14,8 @@ BEGIN
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "FileVersion", "2.11.1\0"
- VALUE "ProductVersion", "2.11.1\0"
+ VALUE "FileVersion", "2.11.2\0"
+ VALUE "ProductVersion", "2.11.2\0"
END
END
END
diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index 44126ec..4276757 100644
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -41,7 +41,7 @@
%define Flavor tog
%define packageVersion 1
-Version: 2.11.1
+Version: 2.11.2
Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
Epoch: 1
diff --git a/src/Clients/cimconfig/tests/result.master b/src/Clients/cimconfig/tests/result.master
index 6a0c8ea..08c5fc1 100644
--- a/src/Clients/cimconfig/tests/result.master
+++ b/src/Clients/cimconfig/tests/result.master
@@ -96,5 +96,5 @@ Usage note: The cimconfig command can be used to update the next planned
configuration without having the CIM Server running. All other options
of the cimconfig command require that the CIM Server is running.
-Version 2.12.0
+Version 2.11.2
diff --git a/src/Clients/cimreparchive/tests/result.master b/src/Clients/cimreparchive/tests/result.master
index 8d5b874..850ec54 100644
--- a/src/Clients/cimreparchive/tests/result.master
+++ b/src/Clients/cimreparchive/tests/result.master
@@ -28,6 +28,6 @@ Options:
--version - Display CIM Server version number
Show version
-Version 2.11.1
+Version 2.11.2
Invalid archive file
Success
diff --git a/src/Clients/cimsub/tests/testscript/result.master b/src/Clients/cimsub/tests/testscript/result.master
index 72a4131..c23d907 100644
--- a/src/Clients/cimsub/tests/testscript/result.master
+++ b/src/Clients/cimsub/tests/testscript/result.master
@@ -162,7 +162,7 @@ cimsub: option "-n" was unexpected
cimsub: Use '--help' to obtain command syntax.
Display version.
-Version 2.11.1
+Version 2.11.2
Unexpected option, combine enable and disable.
cimsub: option "-e" was unexpected
diff --git a/src/Clients/cimsub/tests/testscript/result.master.nocql b/src/Clients/cimsub/tests/testscript/result.master.nocql
index 6d705d9..c995a30 100644
--- a/src/Clients/cimsub/tests/testscript/result.master.nocql
+++ b/src/Clients/cimsub/tests/testscript/result.master.nocql
@@ -162,7 +162,7 @@ cimsub: option "-n" was unexpected
cimsub: Use '--help' to obtain command syntax.
Display version.
-Version 2.10.0
+Version 2.11.2
Unexpected option, combine enable and disable.
cimsub: option "-e" was unexpected
diff --git a/src/Clients/wbemexec/tests/result.master b/src/Clients/wbemexec/tests/result.master
index 9095ab7..51904d9 100644
--- a/src/Clients/wbemexec/tests/result.master
+++ b/src/Clients/wbemexec/tests/result.master
@@ -39,7 +39,7 @@ Options :
Usage note: The wbemexec command requires that the CIM Server is running.
-Version 2.11.1
+Version 2.11.2
All options specified except hostname
wbemexec -p5988 -v1.1 -mM-POST -t10000 -u(PEGASUS_TEST_USER_ID) -w(PEGASUS_TEST_USER_PASS) ./cimrequest.xml
diff --git a/src/Clients/wbemexec/tests/result.master.nossl b/src/Clients/wbemexec/tests/result.master.nossl
index 25beca5..0c80954 100644
--- a/src/Clients/wbemexec/tests/result.master.nossl
+++ b/src/Clients/wbemexec/tests/result.master.nossl
@@ -38,7 +38,7 @@ Options :
Usage note: The wbemexec command requires that the CIM Server is running.
-Version 2.11.1
+Version 2.11.2
All options specified except hostname
wbemexec -p5988 -v1.1 -mM-POST -t10000 -u(PEGASUS_TEST_USER_ID) -w(PEGASUS_TEST_USER_PASS) ./cimrequest.xml
diff --git a/src/Pegasus/Common/PegasusVersion.h b/src/Pegasus/Common/PegasusVersion.h
index c7fe1fc..45fc7b3 100644
--- a/src/Pegasus/Common/PegasusVersion.h
+++ b/src/Pegasus/Common/PegasusVersion.h
@@ -73,7 +73,7 @@
# define PEGASUS_PRODUCT_NAME "CIM Server"
# define PEGASUS_PRODUCT_STATUS ""
-# define PEGASUS_PRODUCT_VERSION "2.11.1"
+# define PEGASUS_PRODUCT_VERSION "2.11.2"
# define PEGASUS_CIMOM_GENERIC_NAME "Pegasus"
// If the following is non-zero length it becomes SLP description.
@@ -147,6 +147,6 @@ static const char *PLATFORM_EMBEDDED_IDENTIFICATION_STRING =
// CAUTION: always check whether PEGASUS_VERSION_NUMBER is defined when
// integrating with versions prior to 2.5.1.
//
-#define PEGASUS_VERSION_NUMBER 0x02110100
+#define PEGASUS_VERSION_NUMBER 0x02110200
#endif /* Pegasus_Version_h */
diff --git a/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master b/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master
index bdf44c7..1112b0b 100644
--- a/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master
+++ b/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master
@@ -5,7 +5,7 @@ Usage: cimcli <command> <CIMObject> <Options> *<extra parameters>
-h xx for <command> and <Example> for <xx> operation
-h for this summary
--help for full help
-Version 2.11.1
+Version 2.11.2
The options for this command are:
This command executes single CIM Operations.
diff --git a/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master.ssl b/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master.ssl
index 4f71822..90aba70 100644
--- a/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master.ssl
+++ b/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master.ssl
@@ -5,7 +5,7 @@ Usage: cimcli <command> <CIMObject> <Options> *<extra parameters>
-h xx for <command> and <Example> for <xx> operation
-h for this summary
--help for full help
-Version 2.11.1
+Version 2.11.2
The options for this command are:
This command executes single CIM Operations.