From 7f0bcd2128efb214b3b67e1d8392fa8147cb43e6 Mon Sep 17 00:00:00 2001
From: "815331793@qq.com" <815331793@qq.com>
Date: Thu, 28 Feb 2019 17:15:04 +0800
Subject: [PATCH 1/2] delete misleading log output

---
 src/s3fs.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index c165ba0..1ff4548 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -4879,10 +4879,7 @@ int main(int argc, char* argv[])
     S3FS_PRN_EXIT("specifying both public_bucket and the access keys options is invalid.");
     exit(EXIT_FAILURE);
   }
-  if(passwd_file.size() > 0 && S3fsCurl::IsSetAccessKeyId()){
-    S3FS_PRN_EXIT("specifying both passwd_file and the access keys options is invalid.");
-    // exit(EXIT_FAILURE);
-  }
+
   if(!S3fsCurl::IsPublicBucket()){
     if(EXIT_SUCCESS != get_access_keys()){
       exit(EXIT_FAILURE);

From dd4c1e87435109c73845d8c2d7ab1a49d3fe2f31 Mon Sep 17 00:00:00 2001
From: "815331793@qq.com" <815331793@qq.com>
Date: Thu, 28 Feb 2019 17:16:03 +0800
Subject: [PATCH 2/2] change cosfs version

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 43d4100..e2f5a7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(cosfs, 1.0.9)
+AC_INIT(cosfs, 1.0.10)
 AC_CONFIG_HEADER([config.h])
 
 AC_CANONICAL_SYSTEM