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 72762200D17 for ; Wed, 30 Aug 2017 18:39:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 71372169817; Wed, 30 Aug 2017 16:39:35 +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 550CC1697F9 for ; Wed, 30 Aug 2017 18:39:33 +0200 (CEST) Received: (qmail 5563 invoked by uid 500); 30 Aug 2017 16:39:32 -0000 Mailing-List: contact commits-help@oodt.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@oodt.apache.org Delivered-To: mailing list commits@oodt.apache.org Received: (qmail 3855 invoked by uid 99); 30 Aug 2017 16:39: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; Wed, 30 Aug 2017 16:39:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4CA0DF556F; Wed, 30 Aug 2017 16:39:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mattmann@apache.org To: commits@oodt.apache.org Date: Wed, 30 Aug 2017 16:40:01 -0000 Message-Id: In-Reply-To: <602f1c7b278843318b280f88fc5fbb83@git.apache.org> References: <602f1c7b278843318b280f88fc5fbb83@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/52] [abbrv] oodt git commit: Merge https://github.com/apache/oodt into feature/zookeeper-config archived-at: Wed, 30 Aug 2017 16:39:35 -0000 Merge https://github.com/apache/oodt into feature/zookeeper-config Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/9543e347 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/9543e347 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/9543e347 Branch: refs/heads/master Commit: 9543e347b6913ef01687cf4e3be27b7bb6add1f0 Parents: 3fb7660 9b7a5e4 Author: Chris Mattmann Authored: Fri Jul 14 21:03:54 2017 -0700 Committer: Chris Mattmann Committed: Fri Jul 14 21:03:54 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../src/main/resources/policy/mimetypes.xsd | 71 ++++++++++++++++++++ 2 files changed, 73 insertions(+) ----------------------------------------------------------------------