Skip to content

Commit

Permalink
Merge branch 'bsd-4.4' into bsd-master
Browse files Browse the repository at this point in the history 
Conflicts:
	clc/Makefile
	clc/modules/autoscaling-common/src/main/resources/autoscaling-binding.xml
	clc/modules/cluster-common/src/main/java/com/eucalyptus/cluster/common/ResourceToken.java
	clc/modules/cluster-common/src/main/java/com/eucalyptus/cluster/common/callback/VmStateCallback.java
	clc/modules/cluster-common/src/main/resources/cc-binding-core.xml
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/SnapshotManager.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/ResourceToken.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/Allocations.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Cluster.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/ClusterClientPipelineFactory.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/Clusters.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/VmStateHandler.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartServiceCallback.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StateUpdateHandler.java
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/event/ClusterEvents.groovy
	clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/SensorsConfigMetadata.java
	clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorBuilder.java
	clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorConfigurationMessages.groovy
	clc/modules/configuration/src/main/java/com/eucalyptus/config/ArbitratorControl.java
	clc/modules/core/src/main/java/com/eucalyptus/event/SystemConfigurationEvent.java
	clc/modules/euare/src/main/java/com/eucalyptus/auth/euare/principal/EuareManagedPolicyVersion.java
	clc/modules/msgs/src/main/java/com/eucalyptus/component/Dispatcher.java
	clc/modules/msgs/src/main/java/com/eucalyptus/component/Service.java
	clc/modules/msgs/src/main/java/com/eucalyptus/component/id/Reporting.java
	clc/modules/msgs/src/main/java/com/eucalyptus/config/ArbitratorConfiguration.groovy
	clc/modules/msgs/src/main/java/com/eucalyptus/system/log/EucaThrowableRenderer.java
	clc/modules/msgs/src/main/java/com/eucalyptus/util/ExposedCommand.java
	clc/modules/msgs/src/main/java/com/eucalyptus/util/FinalReturn.java
	clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferences.java
	clc/modules/msgs/src/main/java/com/eucalyptus/util/NoopPreferencesFactory.java
	clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/NioClient.java
	clc/modules/msgs/src/main/java/com/eucalyptus/ws/client/ServiceDispatcher.java
	clc/modules/msgs/src/main/java/com/eucalyptus/ws/handlers/SoapHandler.java
	clc/modules/msgs/src/main/java/com/eucalyptus/ws/protocol/SoapHandler.java
	clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/Extra.groovy
	clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/cloud/entities/SystemConfiguration.java
	clc/modules/msgs/src/main/java/edu/ucsb/eucalyptus/msgs/ClusterMessages.groovy
	clc/modules/msgs/src/main/resources/CC-binding-core.xml
	clc/modules/msgs/src/main/resources/cc-sensors.xml
	clc/modules/msgs/src/test/groovy/dump_heap.groovy
	clc/modules/object-storage-common/src/main/resources/osg-binding.xml
	clc/modules/portal-common/src/main/java/com/eucalyptus/portal/common/Tag.java
	clc/modules/portal/src/main/java/com/eucalyptus/portal/ws/TagServiceQueryBinding.java
	clc/modules/portal/src/main/java/com/eucalyptus/portal/ws/TagServiceQueryPipeline.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/Period.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportFormat.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportGenerationFacade.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportType.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/ReportingDataVerifier.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AccountArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/AvailabilityZoneArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/BucketUsageArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ClusterArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ComputeCapacityArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ElasticIpUsageArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/InstanceUsageArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/ReportArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UsageTotalsArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/UserArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeSnapshotUsageArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/entity/VolumeUsageArtEntity.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/AbstractArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/ComputeCapacityArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/ElasticIpArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/InstanceArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/S3ArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/generator/VolumeSnapshotArtGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/ComputeCapacityRenderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/ElasticIpRenderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/InstanceRenderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/Renderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/RendererFactory.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/S3Renderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeRenderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/VolumeSnapshotRenderer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/CsvDocument.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/Document.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/document/HtmlDocument.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/AttachDurationCalculator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/DurationCalculator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/IndentingStringBuffer.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/util/StartEndTimes.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingAccount.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingAccountCrud.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingAccountDao.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingComputeDomainModel.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingUser.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingUserCrud.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/domain/ReportingUserDao.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/EventFactory.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingElasticIpAttachEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingElasticIpCreateEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingElasticIpDeleteEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingElasticIpDetachEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingElasticIpEventStore.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingEventIdGenerator.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingEventSupport.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingInstanceCreateEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingInstanceEventStore.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingInstanceUsageEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingS3ObjectCreateEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingS3ObjectDeleteEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingS3ObjectEventStore.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeAttachEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeCreateEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeDeleteEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeDetachEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeEventStore.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeSnapshotCreateEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeSnapshotDeleteEvent.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/event_store/ReportingVolumeSnapshotEventStore.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/export/Export.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/export/ExportUtils.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/export/Import.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/export/ReportedAction.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/export/ReportedUsage.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/export/ReportingExport.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/address/AddressUsageEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/capacity/ResourceAvailabilityEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/instance/InstanceCreationEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/instance/InstanceUsageEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/instance/package.html
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/s3/S3ObjectUsageEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/storage/SnapShotUsageEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/modules/storage/VolumeUsageEventListener.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/package.html
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/service/ReportingException.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/service/ReportingMessages.groovy
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/service/ReportingService.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/service/ws/ReportingErrorHandler.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/service/ws/ReportingQueryBinding.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/SizeUnit.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/TimeUnit.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/UnitUtil.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/units/Units.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/upgrade/PersistenceContext410Upgrade.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/upgrade/PostUpgrade32.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/upgrade/PreUpgrade32.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/upgrade/Upgrade32.java
	clc/modules/reporting/src/main/java/com/eucalyptus/reporting/upgrade/UpgradeUtils.java
	clc/modules/reporting/src/main/resources/reporting-binding.xml
	clc/modules/reporting/src/main/resources/reporting-data-export-binding.xml
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/CsvChecker.java
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/FalseDataGenerator.java
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/generator/ComputeCapacityArtGeneratorTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/generator/ElasticIpArtGeneratorTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/generator/InstanceArtGeneratorTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/generator/S3ArtGeneratorTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/generator/VolumeArtGeneratorTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/ComputeCapacityRendererTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/ElasticIpRendererTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/InstanceRendererTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/RendererTestSupport.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/S3RendererTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/VolumeRendererTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/art/renderer/VolumeSnapshotRendererTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/export/ExportUtilsTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/export/ReportingDataExportBindingTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/modules/address/AddressUsageEventListenerTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/modules/capacity/ResourceAvailabilityEventListenerTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/modules/s3/S3ObjectUsageEventListenerTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/modules/storage/SnapShotUsageEventListenerTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/modules/storage/VolumeUsageEventListenerTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/service/ws/ReportingBindingTest.groovy
	clc/modules/reporting/src/test/java/com/eucalyptus/reporting/units/UnitsTest.groovy
	clc/modules/reporting/src/test/pl/check_db.pl
	clc/modules/reporting/src/test/pl/check_report.pl
	clc/modules/reporting/src/test/pl/fill_template.pl
	clc/modules/reporting/src/test/pl/inject.pl
	clc/modules/reporting/src/test/pl/simulate_one_user.pl
	clc/modules/reporting/src/test/pl/simulate_usage.pl
	clc/modules/reporting/src/test/pl/test.pl
	clc/modules/reporting/src/test/pl/test.sh
	clc/modules/reporting/src/test/pl/test_common.pl
	clc/modules/reporting/src/test/pl/use_resources.template
	clc/modules/reporting/src/test/sh/dbPass.sh
	clc/modules/reporting/src/test/sh/generateFalseData.sh
	clc/modules/reporting/src/test/sh/generateReport.sh
	clc/modules/reporting/src/test/sh/runCmd.sh
	clc/modules/reporting/src/test/sh/runInstanceReportingTest.sh
	clc/modules/reporting/src/test/sh/runRealInstanceReportingTest.sh
	clc/modules/reporting/src/test/sh/runRealS3ReportingTest.sh
	clc/modules/reporting/src/test/sh/runRealStorageReportingTest.sh
	clc/modules/reporting/src/test/sh/runS3ReportingTest.sh
	clc/modules/reporting/src/test/sh/runStorageReportingTest.sh
	clc/modules/reporting/src/test/sh/within_error.bc
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/InvalidOperationException.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/RemoteConfigurationException.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/BrokerBindingHandler.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/ChannelStateMonitor.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/POSTRequestContext.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/TestHandler.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/handlers/wssecurity/BrokerWsSecHandler.java
	clc/modules/wsstack/src/main/java/com/eucalyptus/ws/util/ChannelUtil.java
	devel/generate_reporting_data.sh
	util/instance33.h
  • Loading branch information
@gholms
gholms committed Nov 8, 2017
2 parents e211a4e + 1beec81 commit 722adf1
Show file tree
Hide file tree
Showing 3,187 changed files with 84,722 additions and 94,121 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
731 changes: 30 additions & 701 deletions LICENSE
View file

Large diffs are not rendered by default.

35 changes: 22 additions & 13 deletions Makedefs.in
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
#
# parameters needed to compile eucalyptus: modified by autoconf
#
# Copyright 2009-2014 Eucalyptus Systems, Inc.
# Copyright 2009-2014 Ent. Services Development Corporation LP
#
# This program 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; version 3 of the License.
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the
# following conditions are met:
#
# 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.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
# CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
# additional information or have any questions.
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# This file may incorporate work covered under the following copyright
# and permission notice:
Expand Down
35 changes: 22 additions & 13 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,31 @@
# top-level Eucalyptus makefile
#
# Copyright 2009-2015 Eucalyptus Systems, Inc.
# Copyright 2009-2015 Ent. Services Development Corporation LP
#
# This program 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; version 3 of the License.
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the
# following conditions are met:
#
# 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.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta
# CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need
# additional information or have any questions.
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
# This file may incorporate work covered under the following copyright
# and permission notice:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Requirements and Technical Notes
License
=======

Eucalyptus is published under version 3 of the GNU General Public License. For more information, see the LICENSE file.
Eucalyptus is published under a BSD license. For more information, see the LICENSE file.

Building Eucalyptus
===================
Expand Down
34 changes: 18 additions & 16 deletions admin-tools/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
# Copyright 2015 Eucalyptus Systems, Inc.
# Copyright 2015 Ent. Services Development Corporation LP
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the following
# conditions are met:
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

include ../Makedefs

Expand Down
34 changes: 18 additions & 16 deletions admin-tools/eucalyptus_admin/__init__.py.in
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
# Copyright (c) 2015-2016 Hewlett Packard Enterprise Development LP
# Copyright 2015-2016 Ent. Services Development Corporation LP
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the following
# conditions are met:
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

import os.path
import subprocess
Expand Down
34 changes: 18 additions & 16 deletions admin-tools/eucalyptus_admin/commands/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
# Copyright 2015 Eucalyptus Systems, Inc.
# Copyright 2015 Ent. Services Development Corporation LP
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the following
# conditions are met:
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

import glob
import os.path
Expand Down
34 changes: 18 additions & 16 deletions admin-tools/eucalyptus_admin/commands/bootstrap/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
# Copyright 2015 Eucalyptus Systems, Inc.
# Copyright 2015 Ent. Services Development Corporation LP
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the following
# conditions are met:
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

from requestbuilder import Arg
import requestbuilder.auth.aws
Expand Down
34 changes: 18 additions & 16 deletions admin-tools/eucalyptus_admin/commands/bootstrap/deregisterservice.py
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
# Copyright 2015 Eucalyptus Systems, Inc.
# Copyright 2015 Ent. Services Development Corporation LP
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the following
# conditions are met:
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

from requestbuilder import Arg

Expand Down
34 changes: 18 additions & 16 deletions admin-tools/eucalyptus_admin/commands/bootstrap/describeavailableservicetypes.py
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
# Copyright 2015 Eucalyptus Systems, Inc.
# Copyright 2015 Ent. Services Development Corporation LP
#
# Redistribution and use of this software in source and binary forms,
# with or without modification, are permitted provided that the following
# conditions are met:
# with or without modification, are permitted provided that the
# following conditions are met:
#
# Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
# Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.

from requestbuilder import Arg
from requestbuilder.mixins.formatting import TableOutputMixin
Expand Down
Loading

0 comments on commit 722adf1

Please sign in to comment.