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/15 17:52:13 UTC

[1/2] karaf git commit: Dummy commit to close #50

Repository: karaf
Updated Branches:
  refs/heads/master b9c42b5a3 -> 4fbf8d195


Dummy commit to close #50


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

Branch: refs/heads/master
Commit: de5796244af8c36e15a5f026b2e0e47161b60a9d
Parents: 98652ef
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Dec 15 17:51:34 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Dec 15 17:51:34 2015 +0100

----------------------------------------------------------------------
 README | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/de579624/README
----------------------------------------------------------------------
diff --git a/README b/README
index 2ad7252..459e143 100644
--- a/README
+++ b/README
@@ -75,3 +75,4 @@ Many thanks for using Apache Karaf.
 
 
 The Karaf Team
+


[2/2] karaf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf

Posted by jb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf


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

Branch: refs/heads/master
Commit: 4fbf8d1958c8110203f778c7768348254081e094
Parents: de57962 b9c42b5
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Dec 15 17:51:58 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Dec 15 17:51:58 2015 +0100

----------------------------------------------------------------------
 tooling/karaf-services-maven-plugin/pom.xml     |  6 ++
 .../tracker/GenerateServiceMetadata.java        | 80 ++++++++++++--------
 .../META-INF/m2e/lifecycle-mapping-metadata.xml | 35 +++++++++
 3 files changed, 89 insertions(+), 32 deletions(-)
----------------------------------------------------------------------