Commit 6f79d411 authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

MS-602 Remove zilliz namespace

See merge request megasearch/milvus!651

Former-commit-id: c4f9790a199b1d32eedb5f56abb8451e2f796cbc
parents d241fa03 e18bd8e6

cpp/CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- MS-586 - Remove BUILD_FAISS_WITH_MKL option

- MS-590 - Refine cmake code to support cpplint

- MS-600 - Reconstruct unittest code

- MS-602 - Remove zilliz namespace



# Milvus 0.4.0 (2019-09-12)

cpp/src/cache/Cache.h

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <set>

#include <string>



namespace zilliz {

namespace milvus {

namespace cache {
@@ -88,6 +87,5 @@ class Cache { 


}  // namespace cache

}  // namespace milvus

}  // namespace zilliz



#include "cache/Cache.inl"

cpp/src/cache/Cache.inl

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 






namespace zilliz {



namespace milvus {

namespace cache {
@@ -190,5 +190,5 @@ Cache<ItemObj>::print() { 


} // namespace cache

} // namespace milvus

} // namespace zilliz

cpp/src/cache/CacheMgr.h

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <memory>

#include <string>



namespace zilliz {

namespace milvus {

namespace cache {
@@ -70,6 +69,5 @@ class CacheMgr { 


}  // namespace cache

}  // namespace milvus

}  // namespace zilliz



#include "cache/CacheMgr.inl"

cpp/src/cache/CacheMgr.inl

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
// under the License.





namespace zilliz {



namespace milvus {

namespace cache {
@@ -142,4 +142,4 @@ CacheMgr<ItemObj>::SetCapacity(int64_t capacity) { 


} // namespace cache

} // namespace milvus

} // namespace zilliz