You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/01/16 17:27:38 UTC

git commit: updated refs/heads/master to da8ee45

Updated Branches:
  refs/heads/master 95a92ad2e -> da8ee45a2


Why is the easy solution always to hard


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

Branch: refs/heads/master
Commit: da8ee45a249f89f2ef2a74d225854b37785f6922
Parents: 95a92ad
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Jan 16 17:27:13 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Jan 16 17:27:13 2014 +0100

----------------------------------------------------------------------
 tools/appliance/convert/Convert.class        | Bin 984 -> 984 bytes
 tools/appliance/convert_ovf_vbox_to_esx.xslt |  18 ++++++++++++++++++
 2 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da8ee45a/tools/appliance/convert/Convert.class
----------------------------------------------------------------------
diff --git a/tools/appliance/convert/Convert.class b/tools/appliance/convert/Convert.class
index fca4dd3..3f24341 100644
Binary files a/tools/appliance/convert/Convert.class and b/tools/appliance/convert/Convert.class differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da8ee45a/tools/appliance/convert_ovf_vbox_to_esx.xslt
----------------------------------------------------------------------
diff --git a/tools/appliance/convert_ovf_vbox_to_esx.xslt b/tools/appliance/convert_ovf_vbox_to_esx.xslt
index 2aa1c7e..b07454d 100644
--- a/tools/appliance/convert_ovf_vbox_to_esx.xslt
+++ b/tools/appliance/convert_ovf_vbox_to_esx.xslt
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  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.
+-->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ovf="http://www.vmware.com/schema/ovf/1/envelope" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vbox="http://www.virtualbox.org/ovf/machine">
 
     <xsl:template match="node()|@*">