You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ad...@apache.org on 2019/06/28 09:18:39 UTC
[roller] branch roller-5.2.x updated (8e1d268 -> 0c024ee)
This is an automated email from the ASF dual-hosted git repository.
adityasharma pushed a change to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 8e1d268 Merge pull request #30 from apache/ROL-2136-5.2.x
add c7f7ffe Fixed: NOTICE file does not have standard content (ROL-2138) 1. Rearranged the content as per the standard for Notice and License files 2. Removed credits from Notice file
add b22b36d Fixed: NOTICE file does not have standard content (ROL-2138) Improved text of the ALv2 and improved the statements as per the standards. Removed copyright notice of sub dependencies of Xinha WYSIWYG editor Updated license file as per the standards
add b9e3260 Fixed: NOTICE file does not have standard content (ROL-2138) Improved statements in License file
add 7b737ac Added: separate Notice and License files for the binary release (ROL-2138)
add 7de6564 Improved: LICENSE file for the binaries (ROL-2138) 1. Improved versions of dependencies as per the release used 2. Removed dependencies which are not part of 5.2.x release
new 0c024ee Merge pull request #31 from apache/ROL-2138-5.2.x
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:
LICENSE.txt | 130 +++++++++++-----
NOTICE.txt | 70 +++------
LICENSE.txt => binary-includes/LICENSE.txt | 231 ++++++++++++++++++++++++-----
binary-includes/NOTICE.txt | 27 ++++
4 files changed, 327 insertions(+), 131 deletions(-)
copy LICENSE.txt => binary-includes/LICENSE.txt (62%)
create mode 100644 binary-includes/NOTICE.txt
[roller] 01/01: Merge pull request #31 from apache/ROL-2138-5.2.x
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adityasharma pushed a commit to branch roller-5.2.x
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 0c024ee4ee9b0fb5f6944d3cba91eb77277a8dd6
Merge: 8e1d268 7de6564
Author: Aditya Sharma <ia...@gmail.com>
AuthorDate: Fri Jun 28 14:48:34 2019 +0530
Merge pull request #31 from apache/ROL-2138-5.2.x
Fixed: NOTICE file does not have standard content (ROL-2138)
LICENSE.txt | 130 +++++++++++-----
NOTICE.txt | 70 +++------
LICENSE.txt => binary-includes/LICENSE.txt | 231 ++++++++++++++++++++++++-----
binary-includes/NOTICE.txt | 27 ++++
4 files changed, 327 insertions(+), 131 deletions(-)