Merge branch 'integration' into dev

[libcds.git] / readme.md

diff --git a/readme.md b/readme.md
index 238c37cacd434fe926a051cac3bad28a0e4d6040..7bbc73847151806ac6e472230eef224bf94896c3 100644 (file)
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,14 @@
 CDS C++ library\r
 ===============\r
+[![GitHub version](https://badge.fury.io/gh/khizmax%2Flibcds.svg)](http://badge.fury.io/gh/khizmax%2Flibcds)\r
+<!---\r
+The build time for lib and hdr-test is exceed the limit of 50 minutes\r
+[![Build Status](https://travis-ci.org/khizmax/libcds.svg?branch=dev)](https://travis-ci.org/khizmax/libcds)\r
+-->\r
+<!---\r
+The coverity dataset is about 4G of size and about 1G in compressed state so it is a problem to upload it to the coverity server\r
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/4445/badge.svg)](https://scan.coverity.com/projects/4445)\r
+-->\r
 \r
 The Concurrent Data Structures (CDS) library is a collection of concurrent containers\r
 that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) \r
@@ -12,6 +21,7 @@ The library contains the implementations of the following containers:
   - several algo for lock-free queue, including classic Michael & Scott algorithm and its derivatives,\r
     the flat combining queue, the segmented queue.\r
   - several implementation of unordered set/map - lock-free and fine-grained lock-based\r
+  - [flat-combining] (http://mcg.cs.tau.ac.il/projects/projects/flat-combining) technique\r
   - lock-free [skip-list](http://en.wikipedia.org/wiki/Skip_list)\r
   \r
 Generally, each container has an intrusive and non-intrusive (STL-like) version belonging to \r
@@ -22,6 +32,14 @@ and MS VC++ 12 (2013) Update 4.
 \r
 Download the latest release from http://sourceforge.net/projects/libcds/files/\r
 \r
+See online doxygen-generated doc here: http://libcds.sourceforge.net/doc/cds-api/index.html\r
+\r
+**Pull request requirements**\r
+- Pull-request to *master* branch will be unconditionally rejected\r
+- *integration* branch is intended for pull-request. Usually, *integration* branch is the same as *master*\r
+- *dev* branch is intended for main developing. Usually, it contains unstable code\r
+\r
+\r
 References\r
 ----------\r
 *Stack*\r