You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@stratos.apache.org by is...@apache.org on 2014/04/17 13:40:16 UTC

[2/2] git commit: Merge branch 'ga_license'

Merge branch 'ga_license'


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9aa7fb28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9aa7fb28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9aa7fb28

Branch: refs/heads/master
Commit: 9aa7fb28498c1e880a8700c2241535cf8a3a4c97
Parents: 1cddbd8 cc4b635
Author: Isuru <is...@wso2.com>
Authored: Thu Apr 17 17:09:22 2014 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Apr 17 17:09:22 2014 +0530

----------------------------------------------------------------------
 LICENSE                                         | 34 ++++++++++++--
 NOTICE                                          |  2 +-
 .../modules/distribution/src/main/notice/NOTICE |  2 +-
 .../distribution/src/main/notice/NOTICE         |  2 +-
 .../distribution/src/main/license/LICENSE       | 48 +++++++++++---------
 .../modules/distribution/src/main/notice/NOTICE |  2 +-
 6 files changed, 62 insertions(+), 28 deletions(-)
----------------------------------------------------------------------