Skip to content

Commit 6cd13b7

Browse files
committed
manifest: update mcuboot
Update mcuboot repo to include upmerge version. Update to the documentation wrapper file in order to include new file into doc scope. Update mcuboot doc info version to 1.4.0 Signed-off-by: Andrzej Puzdrowski <[email protected]>
1 parent a2fae4f commit 6cd13b7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

doc/mcuboot/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
# built documents.
6767
#
6868
# The short X.Y version.
69-
version = '1.3.99'
69+
version = '1.4.0'
7070
# The full version, including alpha/beta/rc tags.
71-
release = '1.3.99'
71+
release = '1.4.0'
7272

7373
# The language for content autogenerated by Sphinx. Refer to documentation
7474
# for a list of supported languages.

doc/mcuboot/wrapper.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ MCUboot documentation
2020
testplan-mynewt.md
2121
release.md
2222
PORTING.md
23+
SECURITY.md

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ manifest:
5353
revision: c3be1b52f5e56aaba6039c423478cfaf62a91622
5454
- name: mcuboot
5555
repo-path: fw-nrfconnect-mcuboot
56-
revision: 4e057a11299b61020dfc845638bb867b96d81053
56+
revision: 28be96b05d5adc725c939514d3d1bfd5b0fca519
5757
- name: mcumgr
5858
repo-path: fw-nrfconnect-mcumgr
5959
revision: f663988d35da559a37f263d369842dbce309d1fa

0 commit comments

Comments
 (0)