You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2013/07/18 13:41:18 UTC
[1/2] git commit: Fixed the reference to LICENCE.txt and the addition
of release.properties and pom.xml.releaseBackup files into the src package
Updated Branches:
refs/heads/trunk 714f7bacd -> 306f63dbf
Fixed the reference to LICENCE.txt and the addition of release.properties and pom.xml.releaseBackup files into the src package
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/02af1eb3
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/02af1eb3
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/02af1eb3
Branch: refs/heads/trunk
Commit: 02af1eb3562c6beb5e2d8e21440275c000152b3c
Parents: ce745a5
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jul 18 13:40:07 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jul 18 13:40:07 2013 +0200
----------------------------------------------------------------------
README.txt | 2 +-
distribution/src/main/assembly/src.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/02af1eb3/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 874751e..ef78e7e 100644
--- a/README.txt
+++ b/README.txt
@@ -19,4 +19,4 @@ Refer to the examples in the examples sub projet or the documentation at http://
License
=========
-See the LICENCE.txt file.
+See the LICENCE file.
http://git-wip-us.apache.org/repos/asf/mina/blob/02af1eb3/distribution/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/src.xml b/distribution/src/main/assembly/src.xml
index de62540..c0eae37 100644
--- a/distribution/src/main/assembly/src.xml
+++ b/distribution/src/main/assembly/src.xml
@@ -71,8 +71,8 @@
<exclude>**/surefire*</exclude>
<exclude>**/cobertura.ser</exclude>
<exclude>**/velocity.log</exclude>
- <exclude>distribution</exclude>
- <exclude>distribution/**</exclude>
+ <exclude>**/release.properties</exclude>
+ <exclude>**/pom.xml.releaseBackup</exclude>
</excludes>
</fileSet>
</fileSets>
[2/2] git commit: Merge branch 'trunk' of
http://git-wip-us.apache.org/repos/asf/mina into trunk
Posted by el...@apache.org.
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/mina into trunk
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/306f63db
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/306f63db
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/306f63db
Branch: refs/heads/trunk
Commit: 306f63dbf346be546df041d4214186e0c5e7e0f8
Parents: 02af1eb 714f7ba
Author: Emmanuel Lécharny <el...@apache.org>
Authored: Thu Jul 18 13:40:51 2013 +0200
Committer: Emmanuel Lécharny <el...@apache.org>
Committed: Thu Jul 18 13:40:51 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/mina/codec/IoBuffer.java | 64 ++++++----------
.../org/apache/mina/codec/IoBufferTest.java | 77 ++++++++++++++++++--
2 files changed, 93 insertions(+), 48 deletions(-)
----------------------------------------------------------------------