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 0FB9B179F3 for ; Fri, 25 Sep 2015 17:40:14 +0000 (UTC) Received: (qmail 72925 invoked by uid 500); 25 Sep 2015 17:40:14 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 72904 invoked by uid 500); 25 Sep 2015 17:40:13 -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 72895 invoked by uid 99); 25 Sep 2015 17:40:13 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Sep 2015 17:40:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 8204BC0BD7 for ; Fri, 25 Sep 2015 17:40:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.775 X-Spam-Level: * X-Spam-Status: No, score=1.775 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.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id QAsCJX3BAR68 for ; Fri, 25 Sep 2015 17:40:03 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id B8CA0231CA for ; Fri, 25 Sep 2015 17:40:03 +0000 (UTC) Received: (qmail 72483 invoked by uid 99); 25 Sep 2015 17:40:03 -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, 25 Sep 2015 17:40:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 66CAEE03C0; Fri, 25 Sep 2015 17:40:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: thw@apache.org To: commits@apex.incubator.apache.org Date: Fri, 25 Sep 2015 17:40:05 -0000 Message-Id: <6a38e5ddab114ff28810bdecd6be7a5c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] incubator-apex-core git commit: Merge branch 'apex-149-3.1' of https://github.com/PramodSSImmaneni/incubator-apex-core into release-3.1 Merge branch 'apex-149-3.1' of https://github.com/PramodSSImmaneni/incubator-apex-core into release-3.1 Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/77a86ac2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/77a86ac2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/77a86ac2 Branch: refs/heads/release-3.1 Commit: 77a86ac2deffd0f30a73cb2b1fac1bcc897364d3 Parents: 525604c 55478bf Author: MalharJenkins Authored: Fri Sep 25 10:29:01 2015 -0700 Committer: MalharJenkins Committed: Fri Sep 25 10:29:01 2015 -0700 ---------------------------------------------------------------------- .../stram/security/StramWSFilter.java | 47 +++++++++++++++----- .../security/StramWSFilterInitializer.java | 19 ++++++-- 2 files changed, 50 insertions(+), 16 deletions(-) ----------------------------------------------------------------------