You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/07/02 15:35:51 UTC

git commit: rbd: License change: LGPLv3 -> Apache License 2.0

Updated Branches:
  refs/heads/rbd aafa7c0d7 -> 7e9646e16


rbd: License change: LGPLv3 -> Apache License 2.0


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7e9646e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7e9646e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7e9646e1

Branch: refs/heads/rbd
Commit: 7e9646e1658297e0ac130b81eede23cfe60086af
Parents: aafa7c0
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Jul 2 15:35:22 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Jul 2 15:35:22 2012 +0200

----------------------------------------------------------------------
 .../agent/resource/computing/LibvirtSecretDef.java |   36 +++++++--------
 1 files changed, 17 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7e9646e1/agent/src/com/cloud/agent/resource/computing/LibvirtSecretDef.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtSecretDef.java b/agent/src/com/cloud/agent/resource/computing/LibvirtSecretDef.java
index c1d396c..f7e10c3 100644
--- a/agent/src/com/cloud/agent/resource/computing/LibvirtSecretDef.java
+++ b/agent/src/com/cloud/agent/resource/computing/LibvirtSecretDef.java
@@ -1,21 +1,19 @@
-/**
- *  Copyright (C) 2012 Wido den Hollander  All rights reserved.
- *
- * This software is licensed under the GNU General Public License v3 or later.
- *
- * It is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
+// 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.
 package com.cloud.agent.resource.computing;
 
 public class LibvirtSecretDef {
@@ -105,4 +103,4 @@ public class LibvirtSecretDef {
 		return secretBuilder.toString();
 	}
 	
-}
\ No newline at end of file
+}