diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-01 09:59:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-01 09:59:05 +0000 |
| commit | 5bb5f62ae1313d82b131579004b20ae3c02a53f8 (patch) | |
| tree | ba1e5b169b484eb9544325b6bc8528a8dd7f94bf | |
| parent | 193bcc6b70f107994cdbb69e5ac40d98f833a5f6 (diff) | |
| parent | b7ba1b43d9e8503e86a051f12a5787e3e60a963b (diff) | |
| download | trove-5bb5f62ae1313d82b131579004b20ae3c02a53f8.tar.gz | |
Merge "Correct incorrect i18n of some messages"6.0.0.0b3
4 files changed, 4 insertions, 4 deletions
diff --git a/trove/common/strategies/cluster/experimental/vertica/taskmanager.py b/trove/common/strategies/cluster/experimental/vertica/taskmanager.py index babc86c3..c5ec995c 100644 --- a/trove/common/strategies/cluster/experimental/vertica/taskmanager.py +++ b/trove/common/strategies/cluster/experimental/vertica/taskmanager.py @@ -196,7 +196,7 @@ class VerticaClusterTasks(task_models.ClusterTasks): db_instance.id) if self.get_ip(master_instance) in remove_member_ips: raise RuntimeError(_("Cannot remove master instance!")) - LOG.debug(_("Marking cluster k-safety: %s") % k) + LOG.debug("Marking cluster k-safety: %s" % k) self.get_guest(master_instance).mark_design_ksafe(k) self.get_guest(master_instance).shrink_cluster( remove_member_ips) diff --git a/trove/guestagent/datastore/experimental/postgresql/service/config.py b/trove/guestagent/datastore/experimental/postgresql/service/config.py index 895e0802..859d98cf 100644 --- a/trove/guestagent/datastore/experimental/postgresql/service/config.py +++ b/trove/guestagent/datastore/experimental/postgresql/service/config.py @@ -198,7 +198,7 @@ class PgSqlConfig(PgSqlProcess): if self.configuration_manager.has_system_override(BACKUP_CFG_OVERRIDE): return - LOG.info("Applying changes to WAL config for use by base backups") + LOG.info(_("Applying changes to WAL config for use by base backups")) wal_arch_loc = CONF.postgresql.wal_archive_location if not os.path.isdir(wal_arch_loc): raise RuntimeError(_("Cannot enable backup as WAL dir '%s' does " diff --git a/trove/guestagent/strategies/restore/experimental/postgresql_impl.py b/trove/guestagent/strategies/restore/experimental/postgresql_impl.py index 2a38827b..c8ff4bf5 100644 --- a/trove/guestagent/strategies/restore/experimental/postgresql_impl.py +++ b/trove/guestagent/strategies/restore/experimental/postgresql_impl.py @@ -171,7 +171,7 @@ class PgBaseBackupIncremental(PgBaseBackup): metadata = self.storage.load_metadata(location, checksum) if 'parent_location' in metadata: - LOG.info("Found parent at %s", metadata['parent_location']) + LOG.info(_("Found parent at %s"), metadata['parent_location']) parent_location = metadata['parent_location'] parent_checksum = metadata['parent_checksum'] self._incremental_restore(parent_location, parent_checksum) diff --git a/trove/module/models.py b/trove/module/models.py index c955d4c1..7c7af87a 100644 --- a/trove/module/models.py +++ b/trove/module/models.py @@ -139,7 +139,7 @@ class Module(object): description, tenant_id, datastore, datastore_version, auto_apply, visible, live_update): if module_type.lower() not in Modules.VALID_MODULE_TYPES: - LOG.error("Valid module types: %s" % Modules.VALID_MODULE_TYPES) + LOG.error(_("Valid module types: %s") % Modules.VALID_MODULE_TYPES) raise exception.ModuleTypeNotFound(module_type=module_type) Module.validate_action( context, 'create', tenant_id, auto_apply, visible) |