You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by cc...@apache.org on 2014/08/19 03:15:20 UTC
[1/2] git commit: fix ASF copyright headers on SoftLayer
Repository: jclouds
Updated Branches:
refs/heads/1.8.x 9efd0f5a3 -> d3234b729
fix ASF copyright headers on SoftLayer
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/59dcf247
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/59dcf247
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/59dcf247
Branch: refs/heads/1.8.x
Commit: 59dcf2474fea950887fa061325c865610463d754
Parents: 9efd0f5
Author: Andrea Turli <an...@gmail.com>
Authored: Mon Aug 11 14:27:38 2014 +0200
Committer: Chris Custine <cc...@apache.org>
Committed: Mon Aug 18 19:04:49 2014 -0600
----------------------------------------------------------------------
.../java/org/jclouds/softlayer/domain/VirtualDiskImage.java | 6 +++---
.../softlayer/domain/VirtualGuestBlockDeviceTemplate.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/59dcf247/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
index 8bc6f13..3315b4b 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
@@ -1,8 +1,8 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOBuilderICE file distributed with
+ * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * Builderhe ASF licenses this file to You under the Apache License, Version 2.0
+ * 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
*
@@ -10,7 +10,7 @@
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
- * WIBuilderHOUBuilder WARRANBuilderIES OR CONDIBuilderIONS OF ANY KIND, either express or implied.
+ * 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.
*/
http://git-wip-us.apache.org/repos/asf/jclouds/blob/59dcf247/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
index f72f8cd..aa4aed5 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
@@ -1,8 +1,8 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOBuilderICE file distributed with
+ * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * Builderhe ASF licenses this file to You under the Apache License, Version 2.0
+ * 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
*
@@ -10,7 +10,7 @@
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
- * WIBuilderHOUBuilder WARRANBuilderIES OR CONDIBuilderIONS OF ANY KIND, either express or implied.
+ * 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.
*/
[2/2] git commit: Backport https://github.com/jclouds/jclouds/pull/472
Posted by cc...@apache.org.
Backport https://github.com/jclouds/jclouds/pull/472
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d3234b72
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d3234b72
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d3234b72
Branch: refs/heads/1.8.x
Commit: d3234b7299f38785b9ddd4a71ef6799d678ee3de
Parents: 59dcf24
Author: Chris Custine <cc...@apache.org>
Authored: Mon Aug 18 19:13:27 2014 -0600
Committer: Chris Custine <cc...@apache.org>
Committed: Mon Aug 18 19:13:27 2014 -0600
----------------------------------------------------------------------
resources/checkstyle.xml | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/d3234b72/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 42490cc..a5a2041 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -54,6 +54,25 @@
<property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
</module>
</module>
+ <module name="Header">
+ <property name="header" value="/*\n
+* Licensed to the Apache Software Foundation (ASF) under one or more\n
+* contributor license agreements. See the NOTICE file distributed with\n
+* this work for additional information regarding copyright ownership.\n
+* The ASF licenses this file to You under the Apache License, Version 2.0\n
+* (the "License"); you may not use this file except in compliance with\n
+* the License. You may obtain a copy of the License at\n
+*\n
+* http://www.apache.org/licenses/LICENSE-2.0\n
+*\n
+* Unless required by applicable law or agreed to in writing, software\n
+* distributed under the License is distributed on an "AS IS" BASIS,\n
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n
+* See the License for the specific language governing permissions and\n
+* limitations under the License.\n
+*/\n"/>
+ <property name="fileExtensions" value="java"/>
+ </module>
<module name="RegexpMultiline">
<property name="format" value="@author"/>
<property name="message" value="Do not use Javadoc @author annotation"/>