Merge remote-tracking branch 'remotes/internal/release_1.1.4a'

intel · Feb 13, 2019 · d554cbf · d554cbf
2 parents abb553c + dca58c4
commit d554cbf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,8 +10,8 @@ endif()
 project(Caffe C CXX)
 
 # ---[ Caffe version
-set(CAFFE_TARGET_VERSION "1.1.3" CACHE STRING "Caffe logical version")
-set(CAFFE_TARGET_SOVERSION "1.1.3" CACHE STRING "Caffe soname version")
+set(CAFFE_TARGET_VERSION "1.1.4" CACHE STRING "Caffe logical version")
+set(CAFFE_TARGET_SOVERSION "1.1.4" CACHE STRING "Caffe soname version")
 add_definitions(-DCAFFE_VERSION=${CAFFE_TARGET_VERSION})
 
 # ---[ Using cmake scripts and modules

diff --git a/Makefile b/Makefile
@@ -102,7 +102,7 @@ LIB_BUILD_DIR := $(BUILD_DIR)/lib
 STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a
 DYNAMIC_VERSION_MAJOR 		:= 1
 DYNAMIC_VERSION_MINOR 		:= 1
-DYNAMIC_VERSION_REVISION 	:= 3
+DYNAMIC_VERSION_REVISION 	:= 4
 DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so
 #DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR)
 DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION)

diff --git a/docker/README.md b/docker/README.md
@@ -17,7 +17,7 @@ docker run -ti caffe:cpu caffe --version
 ```
 which should show a message like:
 ```
-caffe version 1.1.3
+caffe version 1.1.4
 ```
 
 One can also build and run the Caffe tests in the image using: