* kubeadm - fix upgrades with external etcd ([#63925](https://github.com/kubernetes/kubernetes/pull/63925), [@detiber](https://github.com/detiber))

    private static void joinThread(final Thread thread) {
        try {
            thread.join();
        } catch (final InterruptedException e) {
            log.warn("Thread join interrupted", e);
            // Restore interrupted status
            Thread.currentThread().interrupt();
        }
    }

    private static boolean isAllDigits(final String hostname) {
        for (int i = 0; i < hostname.length(); i++) {

type TransitionStorageClassNotFound GenericError

func (e TransitionStorageClassNotFound) Error() string {
	return "Transition storage class not found "
}

// InvalidObjectState restore-object doesn't apply for the current state of the object.
type InvalidObjectState GenericError

func (e InvalidObjectState) Error() string {

		copy(b.buf, b.buf[b.off:])
	} else if c > maxInt-c-n {
		panic(ErrTooLarge)
	} else {
		// Add b.off to account for b.buf[:b.off] being sliced off the front.
		b.buf = growSlice(b.buf[b.off:], b.off+n)
	}
	// Restore b.off and len(b.buf).
	b.off = 0
	b.buf = b.buf[:m+n]
	return m
}

// Grow grows the buffer's capacity, if necessary, to guarantee space for

        // page navi
        RenderDataUtil.register(data, "synonymItemItems", synonymService.getSynonymList(form.dictId, synonymPager));

        // restore from pager
        BeanUtil.copyBeanToBean(synonymPager, form, op -> {
            op.exclude(Constants.PAGER_CONVERSION_RULE);
        });
    }

                return null;
            }
        }, "jobHelper");
    }

    @Override
    public void tearDown() throws Exception {
        FileUtils.deleteQuietly(tempDir);

        // Restore original helpers
        if (originalSystemHelper != null) {
            ComponentUtil.register(originalSystemHelper, "systemHelper");
        }
        if (originalProcessHelper != null) {

			HandlerFunc(s3APIMiddleware(api.DeleteObjectHandler))

		// PostRestoreObject
		router.Methods(http.MethodPost).Path("/{object:.+}").
			HandlerFunc(s3APIMiddleware(api.PostRestoreObjectHandler)).
			Queries("restore", "")

		// Bucket operations

		// GetBucketLocation
		router.Methods(http.MethodGet).
			HandlerFunc(s3APIMiddleware(api.GetBucketLocationHandler)).
			Queries("location", "")
		// GetBucketPolicy

labels.menu_wizard=Wizard
labels.menu_crawl_config=General
labels.menu_scheduler_config=Scheduler
labels.menu_dashboard_config=Dashboard
labels.menu_design=Page Design
labels.menu_dict=Dictionary
labels.menu_data=Backup/Restore
labels.menu_crawl=Crawler
labels.menu_web=Web
labels.menu_file_system=File System
labels.menu_data_store=Data Store
labels.menu_label_type=Label
labels.menu_key_match=Key Match

		* Fix false positive "meaningful conflict" detection for strategic merge patch with integer values. ([#44788](https://github.com/kubernetes/kubernetes/pull/44788), [@enisoc](https://github.com/enisoc))

		* Restored the ability of kubectl running inside a pod to consume resource files specifying a different namespace than the one the pod is running in. ([#44862](https://github.com/kubernetes/kubernetes/pull/44862), [@liggitt](https://github.com/liggitt))

* Restored the pre-1.10 behavior of the openstack cloud provider, which uses the instance name as the Kubernetes Node name. This requires instances be named with RFC-1123 compatible names. ([#63903](https://github.com/kubernetes/kubernetes/pull/63903), [@l...