you can add that commit here for my part, please don't squash it;) On Tue, Jul 14, 2015 at 12:30 PM, wido <g...@git.apache.org> wrote: > Github user wido commented on a diff in the pull request: > > https://github.com/apache/cloudstack/pull/582#discussion_r34554904 > > --- Diff: > plugins/storage/image/s3/src/org/apache/cloudstack/storage/datastore/driver/S3ImageStoreDriverImpl.java > --- > @@ -60,7 +60,9 @@ public DataStoreTO getStoreTO(DataStore store) { > : > Integer.valueOf(details.get(ApiConstants.S3_CONNECTION_TIMEOUT)), > details.get(ApiConstants.S3_MAX_ERROR_RETRY) == null ? null > : > Integer.valueOf(details.get(ApiConstants.S3_MAX_ERROR_RETRY)), > details.get(ApiConstants.S3_SOCKET_TIMEOUT) == null ? null > : > Integer.valueOf(details.get(ApiConstants.S3_SOCKET_TIMEOUT)), > imgStore.getCreated(), _configDao.getValue(Config.S3EnableRRS.toString()) == > null ? false > - : > Boolean.parseBoolean(_configDao.getValue(Config.S3EnableRRS.toString())), > getMaxSingleUploadSizeInBytes()); > + : > Boolean.parseBoolean(_configDao.getValue(Config.S3EnableRRS.toString())), > getMaxSingleUploadSizeInBytes(), > + details.get(ApiConstants.S3_CONNECTION_TTL) == null ? > null : Integer.valueOf(details.get(ApiConstants.S3_CONNECTION_TTL)), > + details.get(ApiConstants.S3_USE_TCP_KEEPALIVE) == null ? > null : Boolean.parseBoolean(details.get(ApiConstants.S3_USE_TCP_KEEPALIVE))); > > --- End diff -- > > Oh, I agree with you. It's just that I didn't want to touch the > formatting for this patch. > > When I looked at the code I had the same idea. > > If this PR gets merged I want to send a second commit which fixes this. > > > --- > If your project is set up for it, you can reply to this email and have your > reply appear on GitHub as well. If your project does not have this feature > enabled and wishes so, or if the feature is enabled but not working, please > contact infrastructure at infrastruct...@apache.org or file a JIRA ticket > with INFRA. > ---
-- Daan
