Updated Branches: refs/heads/master ad79ee9f2 -> 703a4e8dd
License header updates for the tools folder. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/703a4e8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/703a4e8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/703a4e8d Branch: refs/heads/master Commit: 703a4e8dd1259e3afe1a1d92a0759886a2fec309 Parents: 58c5a3b Author: Chip Childers <[email protected]> Authored: Fri Aug 3 12:06:56 2012 -0400 Committer: Chip Childers <[email protected]> Committed: Fri Aug 3 12:06:56 2012 -0400 ---------------------------------------------------------------------- tools/.classpath | 18 ++++++++++++ tools/.project | 18 ++++++++++++ .../basebuild/puppet-devcloudinitial/Modulefile | 2 +- .../basebuild/puppet-devcloudinitial/files/grub | 18 ++++++++++++ .../puppet-devcloudinitial/files/interfaces | 17 ++++++++++++ .../puppet-devcloudinitial/files/network.conf | 17 ++++++++++++ .../puppet-devcloudinitial/files/xen-defaults | 17 ++++++++++++ .../basebuild/puppet-devcloudinitial/files/xend | 17 ++++++++++++ .../devcloudbox/puppet-devcloud/Modulefile | 2 +- .../devcloudbox/puppet-devcloud/files/exports | 17 ++++++++++++ .../puppet-devcloud/files/iptables.save | 21 ++++++++++++--- tools/migration/10to21Upgrade.txt | 17 ++++++++++++ tools/migration/upgrade.properties | 17 ++++++++++++ 13 files changed, 192 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/.classpath ---------------------------------------------------------------------- diff --git a/tools/.classpath b/tools/.classpath index c10baa1..41f021f 100644 --- a/tools/.classpath +++ b/tools/.classpath @@ -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. +--> <classpath> <classpathentry kind="lib" path="ant/apache-ant-1.7.1/etc/ant-bootstrap.jar"/> <classpathentry kind="lib" path="ant/apache-ant-1.7.1/lib/ant-antlr.jar"/> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/.project ---------------------------------------------------------------------- diff --git a/tools/.project b/tools/.project index e61ed09..1b4001f 100644 --- a/tools/.project +++ b/tools/.project @@ -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. +--> <projectDescription> <name>tools</name> <comment></comment> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile b/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile index b15a29e..b1ca9ad 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/Modulefile @@ -2,7 +2,7 @@ name 'puppet-devcloudinitial' version '0.0.1' source '' author 'Apache Software Foundation' -license 'Apache 2.0' +license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0' summary 'CloudStack DevCloud initial configuration module' description 'Installation and configuration of all prequisites for building a DevCloud image.' project_page 'http://cloudstack.org' http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub b/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub index 34613da..be14e82 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/files/grub @@ -1,3 +1,21 @@ +# 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. + + # If you change this file, run 'update-grub' afterwards to update # /boot/grub/grub.cfg. # For full documentation of the options in this file, see: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces b/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces index cf88183..f655079 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/files/interfaces @@ -1,3 +1,20 @@ +# 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. + # The loopback network interface auto lo iface lo inet loopback http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf b/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf index 7096907..57ebf64 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf @@ -1 +1,18 @@ +# 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. + bridge http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults b/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults index 6886290..bc3dc67 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/files/xen-defaults @@ -1 +1,18 @@ +# 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. + TOOLSTACK=xapi http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend ---------------------------------------------------------------------- diff --git a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend b/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend index 7fa1077..19ebd49 100644 --- a/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend +++ b/tools/devcloud/basebuild/puppet-devcloudinitial/files/xend @@ -1,4 +1,21 @@ #!/bin/sh +# 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. + ### BEGIN INIT INFO # Provides: xend # Required-Start: $remote_fs http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile ---------------------------------------------------------------------- diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile b/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile index 7da4c4c..ace7d48 100644 --- a/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile +++ b/tools/devcloud/devcloudbox/puppet-devcloud/Modulefile @@ -2,7 +2,7 @@ name 'puppet-devcloud' version '0.0.1' source '' author 'Apache Software Foundation' -license 'Apache 2.0' +license 'Licensed under the Apache License, Version 2.0. http://www.apache.org/licenses/LICENSE-2.0' summary 'CloudStack DevCloud configuration module' description 'Devcloud setup module.' project_page 'http://cloudstack.org' http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/devcloudbox/puppet-devcloud/files/exports ---------------------------------------------------------------------- diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/exports b/tools/devcloud/devcloudbox/puppet-devcloud/files/exports index 55fdcfe..c270c63 100644 --- a/tools/devcloud/devcloudbox/puppet-devcloud/files/exports +++ b/tools/devcloud/devcloudbox/puppet-devcloud/files/exports @@ -1 +1,18 @@ +# 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. + /opt/storage/secondary *(rw,no_subtree_check,no_root_squash,fsid=0) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/devcloud/devcloudbox/puppet-devcloud/files/iptables.save ---------------------------------------------------------------------- diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/iptables.save b/tools/devcloud/devcloudbox/puppet-devcloud/files/iptables.save index c556398..3339327 100644 --- a/tools/devcloud/devcloudbox/puppet-devcloud/files/iptables.save +++ b/tools/devcloud/devcloudbox/puppet-devcloud/files/iptables.save @@ -1,4 +1,20 @@ -# Generated by iptables-save v1.4.12 on Sat Jul 28 03:18:44 2012 +# 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. + *mangle :PREROUTING ACCEPT [397:23804] :INPUT ACCEPT [397:23804] @@ -7,11 +23,8 @@ :POSTROUTING ACCEPT [238:22820] -A POSTROUTING -p udp -m udp --dport 68 -j CHECKSUM --checksum-fill COMMIT -# Completed on Sat Jul 28 03:18:44 2012 -# Generated by iptables-save v1.4.12 on Sat Jul 28 03:18:44 2012 *filter :INPUT ACCEPT [453:27164] :FORWARD ACCEPT [0:0] :OUTPUT ACCEPT [273:26476] COMMIT -# Completed on Sat Jul 28 03:18:44 2012 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/migration/10to21Upgrade.txt ---------------------------------------------------------------------- diff --git a/tools/migration/10to21Upgrade.txt b/tools/migration/10to21Upgrade.txt index fd0f76e..ccbea23 100644 --- a/tools/migration/10to21Upgrade.txt +++ b/tools/migration/10to21Upgrade.txt @@ -1,3 +1,20 @@ +# 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. + CloudStack Migration: 1.0.x to 2.1.x How it works: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/703a4e8d/tools/migration/upgrade.properties ---------------------------------------------------------------------- diff --git a/tools/migration/upgrade.properties b/tools/migration/upgrade.properties index 502d9a1..8cc0b55 100644 --- a/tools/migration/upgrade.properties +++ b/tools/migration/upgrade.properties @@ -1,3 +1,20 @@ +# 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. + ### Users to upgrade # Specify the list of user IDs to upgrade as a comma separated list; i.e. 3, 4, 5
