You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/04/21 21:31:01 UTC

[2/2] incubator-geode git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7de1d32b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7de1d32b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7de1d32b

Branch: refs/heads/develop
Commit: 7de1d32b1a794356f3cdddbd5bd4cc4a92230c44
Parents: ada13a3 f810d62
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Apr 22 05:30:45 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Apr 22 05:30:45 2016 +1000

----------------------------------------------------------------------
 LICENSE                                       | 60 ++++++++++++++++++++++
 geode-assembly/src/main/dist/LICENSE          |  8 ++-
 geode-assembly/src/main/dist/NOTICE           | 36 ++-----------
 geode-pulse/src/main/webapp/META-INF/NOTICE   | 18 +------
 geode-web-api/src/main/webapp/META-INF/NOTICE | 12 +----
 5 files changed, 74 insertions(+), 60 deletions(-)
----------------------------------------------------------------------