Return-Path: X-Original-To: apmail-tamaya-commits-archive@minotaur.apache.org Delivered-To: apmail-tamaya-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 97697182B5 for ; Wed, 1 Jul 2015 22:59:45 +0000 (UTC) Received: (qmail 50213 invoked by uid 500); 1 Jul 2015 22:59:45 -0000 Delivered-To: apmail-tamaya-commits-archive@tamaya.apache.org Received: (qmail 50188 invoked by uid 500); 1 Jul 2015 22:59:45 -0000 Mailing-List: contact commits-help@tamaya.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tamaya.incubator.apache.org Delivered-To: mailing list commits@tamaya.incubator.apache.org Received: (qmail 50173 invoked by uid 99); 1 Jul 2015 22:59:45 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2015 22:59:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EA968D1822 for ; Wed, 1 Jul 2015 22:59:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.209 X-Spam-Level: * X-Spam-Status: No, score=1.209 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.571] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id Fauhj6xNwMFY for ; Wed, 1 Jul 2015 22:59:44 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 49A2521021 for ; Wed, 1 Jul 2015 22:59:43 +0000 (UTC) Received: (qmail 50153 invoked by uid 99); 1 Jul 2015 22:59:42 -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; Wed, 01 Jul 2015 22:59:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57AA6DFBCA; Wed, 1 Jul 2015 22:59:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anatole@apache.org To: commits@tamaya.incubator.apache.org Date: Wed, 01 Jul 2015 22:59:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-tamaya git commit: Merge remote-tracking branch 'origin/master' Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/0469103b Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/0469103b Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/0469103b Branch: refs/heads/master Commit: 0469103bf04a28a5057bcf70261d8289e97869a0 Parents: d0fea28 4e62b05 Author: anatole Authored: Thu Jul 2 00:59:36 2015 +0200 Committer: anatole Committed: Thu Jul 2 00:59:36 2015 +0200 ---------------------------------------------------------------------- distribution/pom.xml | 4 +- .../src/main/assembly/distribution-bin.xml | 131 +++++++++++++++++++ distribution/src/main/assembly/distribution.xml | 131 ------------------- .../tamaya/events/spi/ConfigEventSpi.java | 3 +- 4 files changed, 134 insertions(+), 135 deletions(-) ----------------------------------------------------------------------