Merge remote-tracking branch 'blackheaven/JAMES-2606'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4850f83a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4850f83a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4850f83a Branch: refs/heads/master Commit: 4850f83a8090e877d587dca2fe6b57fdbf3ad565 Parents: d1d75d1 608d10d Author: Raphael Ouazana <raphael.ouaz...@linagora.com> Authored: Thu Dec 13 17:30:36 2018 +0100 Committer: Raphael Ouazana <raphael.ouaz...@linagora.com> Committed: Thu Dec 13 17:30:36 2018 +0100 ---------------------------------------------------------------------- .../package/etc/james/templates/blobstore.properties | 11 +++++++++++ .../package/etc/james/templates/objectstorage.properties | 11 ----------- .../objectstorage/ObjectStorageBlobConfiguration.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4850f83a/server/container/guice/blob-objectstorage-guice/src/main/java/org/apache/james/modules/objectstorage/ObjectStorageBlobConfiguration.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
