Skip to content

Commit

Permalink
Merge pull request #192 from aerospike/2.2.3-in-progress
Browse files Browse the repository at this point in the history
2.2.3 in progress
  • Loading branch information
aerospikerobertmarks committed Oct 10, 2017
2 parents 604b94a + 3520e4c commit af820e3
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion .travis/aerospike.conf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ network {
namespace test {
replication-factor 2
memory-size 1G
ldt-enabled true
default-ttl 30d # 30 days, use 0 to never expire/evict.
storage-engine memory
}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.2
2.2.3
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def resolve_c_client(lua_src_path):

print('info: Executing', './scripts/aerospike-client-c.sh', file=sys.stdout)
os.chmod('./scripts/aerospike-client-c.sh', 0o0755)
os.chmod('./scripts/os_version', 0o0755)
p = Popen(['./scripts/aerospike-client-c.sh'], env=os.environ)
rc = p.wait()

Expand Down
2 changes: 1 addition & 1 deletion src/main/aerospike.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ AerospikeConstants operator_constants[] = {
MOD_INIT(aerospike)
{

const char version[8] = "2.2.2";
const char version[8] = "2.2.3";
// Makes things "thread-safe"
PyEval_InitThreads();
int i = 0;
Expand Down

0 comments on commit af820e3

Please sign in to comment.