ne pas calculer la ligne "<<<<<"

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1332 47090b3f-bbb5-42d7-8af4-003170c53eba
detecte conflict

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1334 47090b3f-bbb5-42d7-8af4-003170c53eba
Correction LogootSplit

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1339 47090b3f-bbb5-42d7-8af4-003170c53eba
Passive replica that only receive ops

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1344 47090b3f-bbb5-42d7-8af4-003170c53eba
GitWalker

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1345 47090b3f-bbb5-42d7-8af4-003170c53eba
+gitWalker2 Multi threaded gitWalker
+Move operation on fctree

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1353 47090b3f-bbb5-42d7-8af4-003170c53eba
Mémoire et autres


git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1354 47090b3f-bbb5-42d7-8af4-003170c53eba
+Detection of number of processor.

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1357 47090b3f-bbb5-42d7-8af4-003170c53eba
+Tree with move compatibility


git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1380 47090b3f-bbb5-42d7-8af4-003170c53eba
+Test commit

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1382 47090b3f-bbb5-42d7-8af4-003170c53eba
+Test commit

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1383 47090b3f-bbb5-42d7-8af4-003170c53eba
Mod horrible main.

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1384 47090b3f-bbb5-42d7-8af4-003170c53eba
Mod horrible main.

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1385 47090b3f-bbb5-42d7-8af4-003170c53eba
+ApplyInsert for a delete operation (drinking is bad mkey - southpark ;) )
+Add  function in mergeAlgorithm to clear the code.

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1386 47090b3f-bbb5-42d7-8af4-003170c53eba
Serializable fix

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1387 47090b3f-bbb5-42d7-8af4-003170c53eba
Jupiter squeleton
Detection of move and update operation (naïve and draft)

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1394 47090b3f-bbb5-42d7-8af4-003170c53eba
+Each node becommes iterable of node
+Each node has same basic interface 
+Modularity of calculus of size of CRDT. Tree can be represented on json(soon) or xml there are not same size.
+Size calculateur of Sequencial document  lookup logoot, woot, treedoc and rga document is a string and use of lenght function is now possible. Just give new StringSizeCalculator() instead false of causal dispatcher constructor.

=Useless parameters of run::CausalSimulator moved to constructor. Because there parameters are already class attributes.


git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1395 47090b3f-bbb5-42d7-8af4-003170c53eba
amélioré causal dispatcher et adapter a ce que stéphane à modifié

git-svn-id: https://scm.gforge.inria.fr/svn/rtcelog/software/JBenchmarkerCE@1396 47090b3f-bbb5-42d7-8af4-003170c53eba
Merge remote-tracking branch 'refs/remotes/git-svn'