You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/08/26 17:40:15 UTC
[1/3] syncope git commit: Upgrading Tomcat
Repository: syncope
Updated Branches:
refs/heads/1_2_X a1737d35a -> 39eb5756b
refs/heads/master 4412ac7b8 -> e54592850
Upgrading Tomcat
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/39eb5756
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/39eb5756
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/39eb5756
Branch: refs/heads/1_2_X
Commit: 39eb5756b0da87327109322b6404cb0b14d1d995
Parents: a1737d3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Aug 26 17:39:16 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Aug 26 17:39:16 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/39eb5756/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a952b3c..6cee0c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@ under the License.
<httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.63</tomcat.version>
+ <tomcat.version>7.0.64</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>
[3/3] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e5459285
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e5459285
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e5459285
Branch: refs/heads/master
Commit: e54592850c95cde8d26f2182f41fe5ce21398512
Parents: 4412ac7 39eb575
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Aug 26 17:39:53 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Aug 26 17:39:53 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] syncope git commit: Upgrading Tomcat
Posted by il...@apache.org.
Upgrading Tomcat
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/39eb5756
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/39eb5756
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/39eb5756
Branch: refs/heads/master
Commit: 39eb5756b0da87327109322b6404cb0b14d1d995
Parents: a1737d3
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Aug 26 17:39:16 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Aug 26 17:39:16 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/39eb5756/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a952b3c..6cee0c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@ under the License.
<httpclient.version>4.3.6</httpclient.version>
- <tomcat.version>7.0.63</tomcat.version>
+ <tomcat.version>7.0.64</tomcat.version>
<jasypt.version>1.9.2</jasypt.version>