diff options
author | broneill <bronee@gmail.com> | 2014-09-04 07:22:49 -0700 |
---|---|---|
committer | broneill <bronee@gmail.com> | 2014-09-04 07:22:49 -0700 |
commit | 13f58b778c5559b24f1b371cfb54ad80a5ba4b3f (patch) | |
tree | 229c18967446555ef381cc022cd95b661f6f90ef /src/main | |
parent | 32d20be647d80ec3509bfa3d7040b0d21cd8cb83 (diff) | |
parent | 51d486867a0f610f034f1934e6d494e5d302f383 (diff) |
Merge branch 'master' into v1.3
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/amazon/carbonado/util/BelatedCreationException.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/main/java/com/amazon/carbonado/util/BelatedCreationException.java b/src/main/java/com/amazon/carbonado/util/BelatedCreationException.java index e9e3cad..d3863ec 100644 --- a/src/main/java/com/amazon/carbonado/util/BelatedCreationException.java +++ b/src/main/java/com/amazon/carbonado/util/BelatedCreationException.java @@ -1,6 +1,19 @@ /* - * Copyright (c) 2013 Amazon.com Inc. All Rights Reserved. - * AMAZON.COM CONFIDENTIAL + * Copyright 2006-2013 Amazon Technologies, Inc. or its affiliates. + * Amazon, Amazon.com and Carbonado are trademarks or registered trademarks + * of Amazon Technologies, Inc. or its affiliates. All rights reserved. + * + * Licensed 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. */ package com.amazon.carbonado.util; |