merge master

This commit is contained in:
Ken Stevens 2021-12-16 14:58:50 -05:00
parent 6a333c08bc
commit a078306a7d
2 changed files with 21 additions and 1 deletions

View File

@ -9,3 +9,23 @@
* Activated by {@link ca.uhn.fhir.jpa.model.config.PartitionSettings#setPartitioningEnabled(boolean)} * Activated by {@link ca.uhn.fhir.jpa.model.config.PartitionSettings#setPartitioningEnabled(boolean)}
*/ */
package ca.uhn.fhir.jpa.subscription; package ca.uhn.fhir.jpa.subscription;
/*-
* #%L
* HAPI FHIR Subscription Server
* %%
* Copyright (C) 2014 - 2021 Smile CDR, Inc.
* %%
* 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.
* #L%
*/

View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.jpa.partition;
/*- /*-
* #%L * #%L
* HAPI FHIR JPA Server * HAPI FHIR Storage api
* %% * %%
* Copyright (C) 2014 - 2021 Smile CDR, Inc. * Copyright (C) 2014 - 2021 Smile CDR, Inc.
* %% * %%