Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A53821827A for ; Mon, 11 May 2015 08:46:13 +0000 (UTC) Received: (qmail 33609 invoked by uid 500); 11 May 2015 08:45:39 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 31629 invoked by uid 500); 11 May 2015 08:45:38 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 30173 invoked by uid 99); 11 May 2015 08:43:31 -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; Mon, 11 May 2015 08:43:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5E4EDFA6B; Mon, 11 May 2015 08:43:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dnwe@apache.org To: commits@qpid.apache.org Date: Mon, 11 May 2015 08:43:32 -0000 Message-Id: <26e5c4c1291949c88189b526bbb573f4@git.apache.org> In-Reply-To: <32a056e447084b19b4c2e9a434cc6cbb@git.apache.org> References: <32a056e447084b19b4c2e9a434cc6cbb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] qpid-proton git commit: Merge branch 'pr-27' Merge branch 'pr-27' Closes #27 Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d39f2228 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d39f2228 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d39f2228 Branch: refs/heads/master Commit: d39f22283275d5993808b467dd82d24f7a0184fe Parents: 30efcdb c31b068 Author: Dominic Evans Authored: Mon May 11 09:40:48 2015 +0100 Committer: Dominic Evans Committed: Mon May 11 09:43:06 2015 +0100 ---------------------------------------------------------------------- proton-c/src/buffer.c | 34 ++++++++++++++++++++++++---------- proton-c/src/error.c | 8 +++++--- proton-c/src/messenger/store.c | 22 ++++++++++++---------- proton-c/src/object/map.c | 12 +++++++----- proton-c/src/object/object.c | 9 ++++++--- proton-c/src/parser.c | 10 ++++++---- tests/tools/apps/c/reactor-recv.c | 8 ++++++-- 7 files changed, 66 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d39f2228/proton-c/src/object/map.c ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org