Merge pull request #219 from aerospike/3.3.0-in-progress

3.3.0 in progress
aerospike · May 24, 2018 · e2231d6 · e2231d6
2 parents c7b4793 + 02a96a0
commit e2231d6
Show file tree

Hide file tree

Showing 20 changed files with 3,353 additions and 875 deletions.
diff --git a/README.rst b/README.rst
@@ -34,7 +34,7 @@ The following are dependencies for:
     sudo yum install python-devel
     sudo yum install openssl-devel
 
-Debian 6+ and Ubuntu 12.04+
+Debian 6+ and Ubuntu 14.04+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following are dependencies for:
@@ -48,6 +48,12 @@ The following are dependencies for:
     sudo apt-get install python-dev
     sudo apt-get install libssl-dev
 
+- You may also need libz:
+
+::
+
+    sudo apt-get install zlib1g-dev
+
 OS X
 ~~~~~~~~
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.2.0
+3.3.0
diff --git a/doc/aerospike.rst b/doc/aerospike.rst
@@ -1351,3 +1351,30 @@ Return types used by various map operations
 
     Return key/value items. Note that key/value pairs will be returned as a list of tuples (i.e. [(key1, value1), (key2, value2)])
 
+
+.. _regex_constants:
+
+Regex Flag Values
+------------------
+Flags used for the `predexp.string_regex` function
+
+.. data:: REGEX_NONE
+
+    Use default behavior.
+
+.. data:: REGEX_ICASE
+
+    Do not differentiate case.
+
+.. data:: REGEX_EXTENDED
+
+    Use POSIX Extended Regular Expression syntax when interpreting regex.
+
+.. data:: REGEX_NOSUB
+
+    Do not report position of matches.
+
+.. data:: REGEX_NEWLINE
+
+    Match-any-character operators don't match a newline.
+