You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/12 02:14:42 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1612] mysql version is
updated
Repository: openmeetings
Updated Branches:
refs/heads/3.2.x 8a06c7f5d -> 8e0925edc
[OPENMEETINGS-1612] mysql version is updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a0dbf5af
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a0dbf5af
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a0dbf5af
Branch: refs/heads/3.2.x
Commit: a0dbf5aff07bab068b4e9e26bf53a6a16e124e7f
Parents: 56ed986
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri May 12 09:14:07 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri May 12 09:14:07 2017 +0700
----------------------------------------------------------------------
openmeetings-web/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a0dbf5af/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index fac0bf4..39d7701 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -30,7 +30,7 @@
<name>Openmeetings Web</name>
<description>Module for all Wicket based UI OpenMeetings components</description>
<properties>
- <mysql.version>5.1.39</mysql.version>
+ <mysql.version>5.1.42</mysql.version>
<old-backups.dir>${project.build.directory}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
</properties>
[2/2] openmeetings git commit: Merge branch '3.2.x' of
https://git-wip-us.apache.org/repos/asf/openmeetings into 3.2.x
Posted by so...@apache.org.
Merge branch '3.2.x' of https://git-wip-us.apache.org/repos/asf/openmeetings into 3.2.x
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8e0925ed
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8e0925ed
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8e0925ed
Branch: refs/heads/3.2.x
Commit: 8e0925edc96e642e08e2e230f536568d8a26d54c
Parents: a0dbf5a 8a06c7f
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri May 12 09:14:16 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri May 12 09:14:16 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/core/util/WebSocketHelper.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------