Merge remote-tracking branch 'gh/mimic'

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.12)
 
 project(ceph CXX C ASM)
-set(VERSION 13.0.2)
+set(VERSION 13.1.0)
 
 if(POLICY CMP0028)
   cmake_policy(SET CMP0028 NEW)

debian/changelog

@@ -1,3 +1,9 @@
+ceph (13.1.0-1) stable; urgency=medium
+
+  * New upstream release
+
+ -- Ceph Release Team <ceph-maintainers@ceph.com>  Thu, 03 May 2018 17:57:32 +0000
+
 ceph (12.1.2-1) stable; urgency=medium
 
   * New upstream release

qa/suites/upgrade/luminous-x/stress-split/0-cluster/start.yaml

@@ -23,7 +23,9 @@ roles:
   - osd.0
   - osd.1
   - osd.2
-- - osd.3
-  - osd.4
+  - osd.3
+- - osd.4
   - osd.5
+  - osd.6
+  - osd.7
 - - client.0

qa/suites/upgrade/luminous-x/stress-split/2-partial-upgrade/firsthalf.yaml

@@ -2,12 +2,12 @@ meta:
 - desc: |
    install upgrade ceph/-x on one node only
    1st half
-   restart : osd.0,1,2
+   restart : osd.0,1,2,3
 tasks:
 - install.upgrade:
     osd.0:
 - print: "**** done install.upgrade osd.0"
 - ceph.restart:
-    daemons: [mon.a,mon.b,mon.c,mgr.x,osd.0,osd.1,osd.2]
+    daemons: [mon.a,mon.b,mon.c,mgr.x,osd.0,osd.1,osd.2,osd.3]
     mon-health-to-clog: false
 - print: "**** done ceph.restart 1st half"

qa/suites/upgrade/luminous-x/stress-split/4-workload/radosbench.yaml

@@ -6,35 +6,47 @@ stress-tasks:
 - full_sequential:
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
   - radosbench:
       clients: [client.0]
-      time: 150
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
+  - radosbench:
+      clients: [client.0]
+      time: 90
 - print: "**** done radosbench 7-workload"

qa/suites/upgrade/luminous-x/stress-split/5-finish-upgrade.yaml

@@ -1,9 +1,9 @@
 tasks:
 - install.upgrade:
-    osd.3:
+    osd.4:
     client.0:
 - ceph.restart:
-    daemons: [osd.3, osd.4, osd.5]
+    daemons: [osd.4, osd.5, osd.6, osd.7]
     wait-for-healthy: false
     wait-for-osds-up: true
 

src/ceph_release

@@ -1,3 +1,3 @@
 13
 mimic
-dev
+rc