Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Bargain/Lib/BargainInterface.php

src/Common/Pool/Config/SellerDistributionPoolConfig.php

@@ -63,7 +63,7 @@ class SellerDistributionPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 200;
+    protected $timeout = 5;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection

src/Common/Pool/Config/SellerPoolConfig.php

@@ -63,7 +63,7 @@ class SellerPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 200;
+    protected $timeout = 5;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection

src/Common/Pool/Config/VipPoolConfig.php

@@ -63,7 +63,7 @@ class VipPoolConfig extends PoolProperties
      *
      *
      * @var int
      * @var int
      */
      */
-    protected $timeout = 200;
+    protected $timeout = 5;
 
 
     /**
     /**
      * the addresses of connection
      * the addresses of connection