Merge branch '4.9' into 4.10
diff --git a/source/upgrade/upgrade-4.2.rst b/source/upgrade/upgrade-4.2.rst
index 48e5a21..daa5bac 100644
--- a/source/upgrade/upgrade-4.2.rst
+++ b/source/upgrade/upgrade-4.2.rst
@@ -281,7 +281,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
diff --git a/source/upgrade/upgrade-4.3.rst b/source/upgrade/upgrade-4.3.rst
index 25b3d8e..3843238 100644
--- a/source/upgrade/upgrade-4.3.rst
+++ b/source/upgrade/upgrade-4.3.rst
@@ -285,7 +285,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
diff --git a/source/upgrade/upgrade-4.4.rst b/source/upgrade/upgrade-4.4.rst
index e83f508..6289efe 100644
--- a/source/upgrade/upgrade-4.4.rst
+++ b/source/upgrade/upgrade-4.4.rst
@@ -287,7 +287,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
diff --git a/source/upgrade/upgrade-4.5.rst b/source/upgrade/upgrade-4.5.rst
index 3e02270..b8f0038 100644
--- a/source/upgrade/upgrade-4.5.rst
+++ b/source/upgrade/upgrade-4.5.rst
@@ -285,7 +285,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
diff --git a/source/upgrade/upgrade-4.6.rst b/source/upgrade/upgrade-4.6.rst
index 9cf055c..cde2160 100644
--- a/source/upgrade/upgrade-4.6.rst
+++ b/source/upgrade/upgrade-4.6.rst
@@ -283,7 +283,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
diff --git a/source/upgrade/upgrade-4.7.rst b/source/upgrade/upgrade-4.7.rst
index bf08600..40f0572 100644
--- a/source/upgrade/upgrade-4.7.rst
+++ b/source/upgrade/upgrade-4.7.rst
@@ -276,7 +276,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
diff --git a/source/upgrade/upgrade-4.8.rst b/source/upgrade/upgrade-4.8.rst
index b98f6fb..d6e97d6 100644
--- a/source/upgrade/upgrade-4.8.rst
+++ b/source/upgrade/upgrade-4.8.rst
@@ -279,7 +279,7 @@
.. sourcecode:: bash
- $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
+ $ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh input="_your_vCenter_password_" password="`cat /etc/cloudstack/management/key`" verbose=false
Store the output from this step, we need to add this in
cluster\_details table and vmware\_data\_center tables in place of
