You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/03/30 10:46:31 UTC

[cloudstack] branch 4.10 updated (922bf02 -> 5dcc3c2)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch 4.10
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 922bf02  Merge branch '4.9' into 4.10
     add d9fb660  CLOUDSTACK-10322: Fix Robot Attack upgrade bountycastle
     add 1ee66e0  Updating pom.xml version numbers for release 4.9.3.1
     add 78abb35  Merge tag '4.9.3.1' into 4.9
     new 5dcc3c2  Merge branch '4.9' into 4.10

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.

[cloudstack] 01/01: Merge branch '4.9' into 4.10

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.10
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 5dcc3c2c549ee4cda65194f0cce81e6c952e362c
Merge: 922bf02 78abb35
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Mar 30 16:16:11 2018 +0530

    Merge branch '4.9' into 4.10
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc pom.xml
index 9e077d1,94b8cbb..067d486
--- a/pom.xml
+++ b/pom.xml
@@@ -63,9 -70,9 +63,9 @@@
      <!-- do not forget to also upgrade hamcrest library with junit -->
      <cs.junit.version>4.12</cs.junit.version>
      <cs.hamcrest.version>1.3</cs.hamcrest.version>
 -    <cs.junit.dataprovider.version>1.10.0</cs.junit.dataprovider.version>
 +    <cs.junit.dataprovider.version>1.12.0</cs.junit.dataprovider.version>
-     <cs.bcprov.version>1.55</cs.bcprov.version>
+     <cs.bcprov.version>1.59</cs.bcprov.version>
 -    <cs.jsch.version>0.1.53</cs.jsch.version>
 +    <cs.jsch.version>0.1.54</cs.jsch.version>
      <cs.jpa.version>2.1.1</cs.jpa.version>
      <cs.jasypt.version>1.9.2</cs.jasypt.version>
      <cs.trilead.version>1.0.0-build220</cs.trilead.version>

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.