From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Aug 2017 16:14:51 +0000 (-0400)
Subject: include/rados: nautilus is next
X-Git-Tag: v13.0.0~120^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3bcb4b3e8d4866eb47f5dca5fbb2ac83b65eed66;p=ceph.git

include/rados: nautilus is next

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index ac1e8fd6473e..df0b973474a0 100644
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -89,6 +89,8 @@ const char *ceph_release_name(int r)
 		return "luminous";
 	case CEPH_RELEASE_MIMIC:
 		return "mimic";
+	case CEPH_RELEASE_NAUTILUS:
+		return "nautilus";
 	default:
 		return "unknown";
 	}
@@ -99,6 +101,9 @@ int ceph_release_from_name(const char *s)
 	if (!s) {
 		return -1;
 	}
+	if (strcmp(s, "nautilus") == 0) {
+		return CEPH_RELEASE_NAUTILUS;
+	}
 	if (strcmp(s, "mimic") == 0) {
 		return CEPH_RELEASE_MIMIC;
 	}
diff --git a/src/include/rados.h b/src/include/rados.h
index 0a242b72b152..d8bce989172a 100644
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -183,7 +183,8 @@ extern const char *ceph_osd_state_name(int s);
 #define CEPH_RELEASE_KRAKEN     11
 #define CEPH_RELEASE_LUMINOUS   12
 #define CEPH_RELEASE_MIMIC      13
-#define CEPH_RELEASE_MAX        14  /* highest + 1 */
+#define CEPH_RELEASE_NAUTILUS   14
+#define CEPH_RELEASE_MAX        15  /* highest + 1 */
 
 extern const char *ceph_release_name(int r);
 extern int ceph_release_from_name(const char *s);