Merge branch 'master' into capture

Signed-off-by: imarom <imarom@cisco.com>

Conflicts:
	scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
	scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
	scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
	src/main_dpdk.cpp

1 files changed, 33 insertions, 0 deletions

diff --git a/scripts/external_libs/elasticsearch/elasticsearch/connection/pooling.py b/scripts/external_libs/elasticsearch/elasticsearch/connection/pooling.py
new file mode 100644
index 00000000..3115e7c2
--- /dev/null
+++ b/scripts/external_libs/elasticsearch/elasticsearch/connection/pooling.py
@@ -0,0 +1,33 @@
+try:
+    import queue
+except ImportError:
+    import Queue as queue
+from .base import Connection
+
+
+class PoolingConnection(Connection):
+    """
+    Base connection class for connections that use libraries without thread
+    safety and no capacity for connection pooling. To use this just implement a
+    ``_make_connection`` method that constructs a new connection and returns
+    it.
+    """
+    def __init__(self, *args, **kwargs):
+        self._free_connections = queue.Queue()
+        super(PoolingConnection, self).__init__(*args, **kwargs)
+
+    def _get_connection(self):
+        try:
+            return self._free_connections.get_nowait()
+        except queue.Empty:
+            return self._make_connection()
+
+    def _release_connection(self, con):
+        self._free_connections.put(con)
+
+    def close(self):
+        """
+        Explicitly close connection
+        """
+        pass
+