Agreement on military service: conscription and troop expansion figures

After lengthy negotiations, the CDU/CSU and SPD have reached an agreement on military service. What are the plans?