You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/12/02 17:23:41 UTC

[1/2] karaf git commit: Update NOTICE

Repository: karaf
Updated Branches:
  refs/heads/master 1734c6cc7 -> 78ac9ea40


Update NOTICE

Noticed this word was wrong. Or else the paragraph is in the wrong section.

(PS - Honestly I don't make a habit of pedantry I'm setting up the NOTICE for Apache Brooklyn (incubating) and looking at how others did it.  :) )

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b17f6995
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b17f6995
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b17f6995

Branch: refs/heads/master
Commit: b17f6995f6f366d79bb678fd5ad56c430e02e037
Parents: 100ab56
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Sep 19 11:16:16 2014 +0300
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 19 11:16:16 2014 +0300

----------------------------------------------------------------------
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/b17f6995/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index b70f1f9..577362f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -8,7 +8,7 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 Licensed under the Apache License 2.0.
 
-This product uses software developed at
+This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
 Copyright (c) OSGi Alliance (2000, 2010).
 Licensed under the Apache License 2.0.


[2/2] karaf git commit: Merge branch 'patch-1' of https://github.com/ahgittin/karaf

Posted by jb...@apache.org.
Merge branch 'patch-1' of https://github.com/ahgittin/karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/78ac9ea4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/78ac9ea4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/78ac9ea4

Branch: refs/heads/master
Commit: 78ac9ea40187457dcb57afe493283382d552e1ae
Parents: 1734c6c b17f699
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 2 17:23:08 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 2 17:23:08 2015 +0100

----------------------------------------------------------------------
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------