Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 68FDF200BCE for ; Fri, 2 Dec 2016 11:47:46 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 67D0D160B27; Fri, 2 Dec 2016 10:47:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C4AF0160B16 for ; Fri, 2 Dec 2016 11:47:45 +0100 (CET) Received: (qmail 65607 invoked by uid 500); 2 Dec 2016 10:47:45 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 65588 invoked by uid 99); 2 Dec 2016 10:47:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2016 10:47:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CA1D1E962C; Fri, 2 Dec 2016 10:47:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gricciardi@apache.org To: commits@celix.apache.org Date: Fri, 02 Dec 2016 10:47:45 -0000 Message-Id: <8c01d14c4c8649ba99b810108d203b9a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] celix git commit: Merge branch 'etcdlib' of https://github.com/ErjanAltena/celix into develop archived-at: Fri, 02 Dec 2016 10:47:46 -0000 Merge branch 'etcdlib' of https://github.com/ErjanAltena/celix into develop Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/978d668e Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/978d668e Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/978d668e Branch: refs/heads/develop Commit: 978d668e9c864a27b9525ec693f5236b8c30ff94 Parents: f0d4853 6cf75ce Author: gricciardi Authored: Fri Dec 2 11:01:59 2016 +0100 Committer: gricciardi Committed: Fri Dec 2 11:01:59 2016 +0100 ---------------------------------------------------------------------- CMakeLists.txt | 1 + documents/subprojects/readme.md | 1 + etcdlib/CMakeLists.txt | 45 ++++ etcdlib/private/src/etcd.c | 481 +++++++++++++++++++++++++++++++++++ etcdlib/public/include/etcd.h | 94 +++++++ 5 files changed, 622 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/978d668e/documents/subprojects/readme.md ---------------------------------------------------------------------- diff --cc documents/subprojects/readme.md index dab6077,17627fa..6c95600 --- a/documents/subprojects/readme.md +++ b/documents/subprojects/readme.md @@@ -3,9 -3,10 +3,10 @@@ Apache Celix is organized into several subprojects. The following subproject are currently available: * [Framework](../../framework) - The Apache Celix framework, an implementation of OSGi adapted to C. -* [Dependency Manager](../../dependency_manager) - A C component/dependency model for use through an API provided as library. +* [C Dependency Manager](../../dependency_manager) - A C component/dependency model for use through an API provided as library. * [C++ Dependency Manager](../../dependency_manager_cxx) - A C++ component/dependency model for use through an API provided as library. * [Device Access](../../device_access) - An implementation of the OSGi Device Access specification adapted to C. + * [Etcd library](../../etcdlib) - A C library that interfaces with ETCD. * [Examples](../../examples) - A Selection of examples showing how the framework can be used. * [Log Service](../../log_service) - An implementation of the OSGi Log Service adapated to C. * [Log Writer](../../log_writer) - A simple log writer for use in combination with the Log Service.