Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-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 8DF0A18233 for ; Wed, 18 Nov 2015 07:12:25 +0000 (UTC) Received: (qmail 74496 invoked by uid 500); 18 Nov 2015 07:12:25 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 74460 invoked by uid 500); 18 Nov 2015 07:12:25 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 74451 invoked by uid 99); 18 Nov 2015 07:12:25 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2015 07:12:25 +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 18DD8C396B for ; Wed, 18 Nov 2015 07:12:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 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.553] 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 su1h5MFvm-y7 for ; Wed, 18 Nov 2015 07:12:19 +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 1477C2315C for ; Wed, 18 Nov 2015 07:12:17 +0000 (UTC) Received: (qmail 74404 invoked by uid 99); 18 Nov 2015 07:12:17 -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, 18 Nov 2015 07:12:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2298BDFBA3; Wed, 18 Nov 2015 07:12:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brightchen@apache.org To: commits@apex.incubator.apache.org Date: Wed, 18 Nov 2015 07:12:18 -0000 Message-Id: In-Reply-To: <7eddcc8bf61d4674bb31de5c4cc04e3c@git.apache.org> References: <7eddcc8bf61d4674bb31de5c4cc04e3c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1908' into devel-3 Merge branch 'MLHR-1908' into devel-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/2f97e7a4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/2f97e7a4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/2f97e7a4 Branch: refs/heads/devel-3 Commit: 2f97e7a4088bc753c97e80974766671b321d5fa4 Parents: d116d94 6574258 Author: bright Authored: Tue Nov 17 23:09:51 2015 -0800 Committer: bright Committed: Tue Nov 17 23:09:51 2015 -0800 ---------------------------------------------------------------------- .../datatorrent/lib/appdata/gpo/GPOUtils.java | 340 +++++++++++++------ .../lib/appdata/gpo/GPOUtilsTest.java | 32 +- .../test/resources/deserializeToMapTest.json | 5 + 3 files changed, 266 insertions(+), 111 deletions(-) ----------------------------------------------------------------------