diff options
| author | David Pilato <david@pilato.fr> | 2016-03-13 14:52:10 +0100 |
|---|---|---|
| committer | David Pilato <david@pilato.fr> | 2016-03-13 14:52:10 +0100 |
| commit | 9acb0bb28ce4f6affe3de86943acb393d9c665ec (patch) | |
| tree | 8b051e8556cb9bad1dc665eb337d0be16ad9895a /plugins/repository-azure | |
| parent | e35032950ecaf1362ef015bc32e7d7fdcf8d2249 (diff) | |
| parent | 625695a92a3fc4c2850cd5d11ac5e739591beffc (diff) | |
Merge branch 'master' into pr/16598-register-filter-settings
# Conflicts:
# core/src/main/java/org/elasticsearch/cluster/service/InternalClusterService.java
# core/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java
# core/src/main/java/org/elasticsearch/common/settings/Setting.java
Diffstat (limited to 'plugins/repository-azure')
| -rw-r--r-- | plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java b/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java index cdc6d74edb..497b0e3753 100644 --- a/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java +++ b/plugins/repository-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java @@ -169,7 +169,7 @@ public class AzureStorageServiceImpl extends AbstractLifecycleComponent<AzureSto logger.trace("creating container [{}]", container); blob_container.createIfNotExists(); } catch (IllegalArgumentException e) { - logger.trace("fails creating container [{}]", container, e.getMessage()); + logger.trace("fails creating container [{}]", e, container); throw new RepositoryException(container, e.getMessage()); } } |