BUG#: 8757

TITLE: Set version status for 2.11.0 development

diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index 2717333e26a3987aa9a7b8b164054dd7f31d9e26..a96af4003cf84d0aa17ab827e99e320ba459509b 100644 (file)
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -10,8 +10,8 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
 PEGASUS_OVERRIDE_PRODUCT_ID=yes
 PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
 PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.10.0"
-PEGASUS_PRODUCT_STATUS=""
+PEGASUS_PRODUCT_VERSION="2.11.0"
+PEGASUS_PRODUCT_STATUS="Development"
 
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 

diff --git a/env_var_Linux.status b/env_var_Linux.status
index 84a08371d204d81e22b82c89739ebd2e46e00019..8edfde6050039bf8a06371b2ae57659be04c225c 100644 (file)
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -9,9 +9,9 @@ PEGASUS_ENABLE_MAKE_INSTALL = yes
 PEGASUS_OVERRIDE_PRODUCT_ID=yes
 PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS=yes
 PEGASUS_PRODUCT_NAME="OpenPegasus"
-PEGASUS_PRODUCT_VERSION="2.10.0"
+PEGASUS_PRODUCT_VERSION="2.11.0"
 PEGASUS_PACKAGE_VERSION=1
-PEGASUS_PRODUCT_STATUS=""
+PEGASUS_PRODUCT_STATUS="Development"
 
 ifndef PEGASUS_STAGING_DIR
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
@@ -63,7 +63,7 @@ PAM_CONFIG_FILE=wbem$(PEGASUS_FLAVOR)
 endif
 
 PAM_CONFIG_DIR=/etc/pam.d
-PEGASUS_DOC_DIR = $(PEGASUS_PROD_DIR)/share/doc/$(PEGASUS_FLAVOR)-pegasus-2.10
+PEGASUS_DOC_DIR = $(PEGASUS_PROD_DIR)/share/doc/$(PEGASUS_FLAVOR)-pegasus-2.11
 PEGASUS_MAN_DIR = $(PEGASUS_PROD_DIR)/share/man
 PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share/Pegasus
 PEGASUS_INCLUDE_DIR = $(PEGASUS_PROD_DIR)/include

diff --git a/mak/version-windows.RC b/mak/version-windows.RC
index d5bbcc05ee6a845bb758f2b58dcdd76a63cc1f87..0c602faad8d24e193e3888a0dffd14e340db9bdf 100644 (file)
--- a/mak/version-windows.RC
+++ b/mak/version-windows.RC
@@ -2,8 +2,8 @@
 
 1 VERSIONINFO
 
-FILEVERSION 2,10,0
-PRODUCTVERSION 2,10,0
+FILEVERSION 2,11,0
+PRODUCTVERSION 2,11,0
 FILEFLAGSMASK 0x00
 FILEFLAGS 0x00
 FILEOS VOS__WINDOWS32
@@ -14,8 +14,8 @@ BEGIN
     BEGIN
         BLOCK "040904E4"
         BEGIN
-            VALUE "FileVersion",      "2.10.0\0"
-            VALUE "ProductVersion",   "2.10.0\0"
+            VALUE "FileVersion",      "2.11.0\0"
+            VALUE "ProductVersion",   "2.11.0\0"
         END
     END
 END

diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index 49217206c9b7594f6f3f7ba0b6bdb33e321a3c6c..58ab7aa648ebe9d3d5479f76d32ec1eb30bd41ff 100644 (file)
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -41,7 +41,7 @@
 
 %define Flavor  tog
 %define packageVersion 1
-Version: 2.10.0
+Version: 2.11.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
 Epoch:   1
 

diff --git a/src/Clients/cimreparchive/tests/result.master b/src/Clients/cimreparchive/tests/result.master
index 44833595e89e1232f7a3ae5b5f2f81a1d1ad1cbd..08f9ae0756505a47e23cd5dda3c64a24f348142f 100644 (file)
--- 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.10.0
+Version 2.11.0
 Invalid archive file
 Success

diff --git a/src/Clients/cimsub/tests/testscript/result.master b/src/Clients/cimsub/tests/testscript/result.master
index 3d269e0e3d9b5b56da9d9608f2c5a7cbdb2a566b..4ec47c5ed29ed506691d475cd85056e81ecf268d 100644 (file)
--- 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.10.0
+Version 2.11.0
 
 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 cd1dee72b3c6dbfd0f45e6fbb97be01b6fa576cf..b69abdba015550c44c63a21821188f333cb80b24 100644 (file)
--- 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.10.0
+Version 2.11.0
   
 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 1092d236a357b0cda9255846dca75199a130b0e3..bff41a47739ed6e3b0e15a24c206151c8fb78030 100644 (file)
--- 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.10.0
+Version 2.11.0
   
 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 45e521f793b1ff5f6620e4708ff2b41e25041269..905692fe76a49518e6bd99cbe49a9c1a87a90e5a 100644 (file)
--- a/src/Pegasus/Common/PegasusVersion.h
+++ b/src/Pegasus/Common/PegasusVersion.h
@@ -72,8 +72,8 @@
 
 # define PEGASUS_PRODUCT_NAME    "CIM Server"
 
-# define PEGASUS_PRODUCT_STATUS  ""
-# define PEGASUS_PRODUCT_VERSION "2.10.0"
+# define PEGASUS_PRODUCT_STATUS  "Development"
+# define PEGASUS_PRODUCT_VERSION "2.11.0"
 
 # 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 0x02100000
+#define PEGASUS_VERSION_NUMBER 0x02110000
 
 #endif /* Pegasus_Version_h */

diff --git a/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master b/src/Providers/TestProviders/CLITestProvider/tests/helpresult.master
index 4114abb2ad47e03b129d335ff465de417ce46977..4409eb7e74beac3b8f4da80145531990255a2222 100644 (file)
--- 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.10.0
+Version 2.11.0
 The options for this command are:
 
 This command executes single CIM Operations.