Skip to content

Commit 124649f

Browse files
author
root
committed
add missing license
1 parent 625fb4e commit 124649f

File tree

5 files changed

+47
-13
lines changed

5 files changed

+47
-13
lines changed

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@
636636
<groupId>org.apache.cloudstack</groupId>
637637
<artifactId>cloud-plugin-storage-object-ecs</artifactId>
638638
<version>${project.version}</version>
639-
</dependency>
639+
</dependency>
640640
<dependency>
641641
<groupId>org.apache.cloudstack</groupId>
642642
<artifactId>cloud-plugin-storage-object-ceph</artifactId>

plugins/storage/object/ECS/src/main/java/org/apache/cloudstack/storage/datastore/driver/EcsObjectStoreDriverImpl.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
/* ... license header unchanged ... */
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
219
package org.apache.cloudstack.storage.datastore.driver;
320

421
import java.nio.charset.StandardCharsets;

plugins/storage/object/ECS/src/main/resources/META-INF/cloudstack/storage-object-ecs/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717
name=storage-object-ecs
18-
parent=storage
18+
parent=storage
Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
119
<beans xmlns="http://www.springframework.org/schema/beans"
220
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
321
xmlns:context="http://www.springframework.org/schema/context"
4-
xsi:schemaLocation="
5-
http://www.springframework.org/schema/beans
6-
http://www.springframework.org/schema/beans/spring-beans.xsd
7-
http://www.springframework.org/schema/context
8-
http://www.springframework.org/schema/context/spring-context.xsd">
9-
10-
<!-- Just declare the provider bean; it will use ComponentContext.inject()
11-
for lifecycle and driver, same as Ceph. -->
22+
xmlns:aop="http://www.springframework.org/schema/aop"
23+
xsi:schemaLocation="http://www.springframework.org/schema/beans
24+
http://www.springframework.org/schema/beans/spring-beans.xsd
25+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
26+
http://www.springframework.org/schema/context
27+
http://www.springframework.org/schema/context/spring-context.xsd"
28+
>
1229
<bean id="EcsObjectStoreProviderImpl"
1330
class="org.apache.cloudstack.storage.datastore.provider.EcsObjectStoreProviderImpl" />
14-
</beans>
31+
</beans>

tools/marvin/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
raise RuntimeError("python setuptools is required to build Marvin")
2828

2929

30-
VERSION = "4.23.0.0-SNAPSHOT"
30+
VERSION = "4.23.0.0"
3131

3232
setup(name="Marvin",
3333
version=VERSION,

0 commit comments

Comments
 (0)