You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by bo...@apache.org on 2014/11/09 10:47:12 UTC
[1/2] incubator-argus git commit: Change license for infinispan
config file to Apache
Repository: incubator-argus
Updated Branches:
refs/heads/master c282dca29 -> d0b0ffc73
Change license for infinispan config file to Apache
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/bd9039ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/bd9039ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/bd9039ba
Branch: refs/heads/master
Commit: bd9039ba3a8b3f382cbdf464b934d8d3d11121f5
Parents: e0fe486
Author: Don Bosco Durai <bo...@apache.org>
Authored: Sat Nov 8 14:24:23 2014 -0800
Committer: Don Bosco Durai <bo...@apache.org>
Committed: Sat Nov 8 14:24:23 2014 -0800
----------------------------------------------------------------------
.../META-INF/infinispan-cache-config.xml | 36 ++++++++------------
1 file changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/bd9039ba/security-admin/src/main/resources/META-INF/infinispan-cache-config.xml
----------------------------------------------------------------------
diff --git a/security-admin/src/main/resources/META-INF/infinispan-cache-config.xml b/security-admin/src/main/resources/META-INF/infinispan-cache-config.xml
index e66ddd8..7bb96ad 100644
--- a/security-admin/src/main/resources/META-INF/infinispan-cache-config.xml
+++ b/security-admin/src/main/resources/META-INF/infinispan-cache-config.xml
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ JBoss, Home of Professional Open Source
- ~ Copyright 2010 Red Hat Inc. and/or its affiliates and other
- ~ contributors as indicated by the @author tags. All rights reserved.
- ~ See the copyright.txt in the distribution for a full listing of
- ~ individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<infinispan>
<default>
<!-- http://docs.jboss.org/infinispan/5.0/apidocs/config.html -->
[2/2] incubator-argus git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-argus.git
Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-argus.git
Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/d0b0ffc7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/d0b0ffc7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/d0b0ffc7
Branch: refs/heads/master
Commit: d0b0ffc7397baf33fec2e9bfc672d5730db461db
Parents: bd9039b c282dca
Author: Don Bosco Durai <bo...@apache.org>
Authored: Sun Nov 9 01:45:09 2014 -0800
Committer: Don Bosco Durai <bo...@apache.org>
Committed: Sun Nov 9 01:45:09 2014 -0800
----------------------------------------------------------------------
security-admin/unixauth-config/cacerts | Bin 232758 -> 0 bytes
security-admin/unixauth-config/keystore.jks | Bin 2257 -> 0 bytes
security-admin/unixauth-config/server.crt | 19 -----
.../unixauth-config/unixauth.properties | 11 +--
.../unix/jaas/RemoteUnixLoginModule.java | 78 +++++++++++++------
unixauthservice/cert/authserver.jks | Bin 2278 -> 0 bytes
unixauthservice/cert/mytruststore.jks | Bin 174807 -> 0 bytes
.../conf.dist/unixauthservice.properties | 8 +-
unixauthservice/scripts/set_globals.sh | 2 +-
unixauthservice/scripts/setup.sh | 17 +++-
unixauthservice/scripts/start.sh | 2 +-
.../UnixAuthenticationService.java | 22 ++++--
12 files changed, 100 insertions(+), 59 deletions(-)
----------------------------------------------------------------------