Skip to content

Commit

Permalink
Merge pull request #189 from aerospike/2.2.2-ami-fix
Browse files Browse the repository at this point in the history
add support for c client resolution on ami
  • Loading branch information
Jeff Boone committed Oct 2, 2017
2 parents 4c68d8a + aff21ea commit 604b94a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
2.2.1
2.2.2
8 changes: 7 additions & 1 deletion scripts/os_version
Expand Up @@ -66,6 +66,9 @@ main() {
*'scientific'* )
distro_id='scientific'
;;
*'amazon linux'* )
distro_id='ami'
;;
* )
error "/etc/issue contained an unsupported linux distibution: $issue"
exit 1
Expand All @@ -87,6 +90,9 @@ main() {
debian_version=$(cat /etc/debian_version | tr '[:upper:]' '[:lower:]')
distro_version=${debian_version%%.*}
;;
'ami' )
distro_version='ami'
;;
* )
error "/etc/issue contained an unsupported linux distibution: $issue"
exit 1
Expand Down Expand Up @@ -157,7 +163,7 @@ main() {
distro_version=${distro_version%.*}
distro_short="${distro_id}${distro_version}"
;;
'amzn' )
'amzn' | 'ami' )
distro_long="ami"
distro_short="ami"
;;
Expand Down
2 changes: 1 addition & 1 deletion src/main/aerospike.c
Expand Up @@ -82,7 +82,7 @@ AerospikeConstants operator_constants[] = {
MOD_INIT(aerospike)
{

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

0 comments on commit 604b94a

Please sign in to comment.