add a TODO wrt naming jcr:namespaces

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1348827 13f79535-47bb-0310-9956-ffa450edef68
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation 
add mechanism for conflict reconciliation to Root.commit() and Root.rebase()

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349742 13f79535-47bb-0310-9956-ffa450edef68
missing license header

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349875 13f79535-47bb-0310-9956-ffa450edef68
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
test case

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349877 13f79535-47bb-0310-9956-ffa450edef68
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
rename test case to better match classes under test

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349880 13f79535-47bb-0310-9956-ffa450edef68
OAK-137 Query: content index (simplify the API a bit)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349882 13f79535-47bb-0310-9956-ffa450edef68
OAK-34 Define query API (simplify the Cursor interface; use the oak-core Tree implementation)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349886 13f79535-47bb-0310-9956-ffa450edef68
remove/replace constructor only used from tests

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1349895 13f79535-47bb-0310-9956-ffa450edef68
OAK-130: Unexpected result of MicroKernel#getJournal after MicroKernel#merge

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350147 13f79535-47bb-0310-9956-ffa450edef68
OAK-130: Unexpected result of MicroKernel#getJournal after MicroKernel#merge

extended test case

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350198 13f79535-47bb-0310-9956-ffa450edef68
OAK-139: Remove JsonBuilder

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350206 13f79535-47bb-0310-9956-ffa450edef68
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
Add ConflictHandler which annotates conflicts on nodes

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350229 13f79535-47bb-0310-9956-ffa450edef68
minor optimization


git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350279 13f79535-47bb-0310-9956-ffa450edef68
oops

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350285 13f79535-47bb-0310-9956-ffa450edef68
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
Add Validator which fails the commit on presence of merge conflict markers (mix:mergeConflict)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350287 13f79535-47bb-0310-9956-ffa450edef68
OAK-6: update test exclusions (induced by OAK-133)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350288 13f79535-47bb-0310-9956-ffa450edef68
OAK-122: Performance test suite
Thanks to Michael Marth for the patch

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350325 13f79535-47bb-0310-9956-ffa450edef68
OAK-119: Oak performance benchmark
 added todo

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350335 13f79535-47bb-0310-9956-ffa450edef68
OAK-11: Document and tighten contract of Microkernel API

fix minor inconsistency

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350609 13f79535-47bb-0310-9956-ffa450edef68
OAK-142: MicroKernel API: returning the :hash property should be optional

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1350642 13f79535-47bb-0310-9956-ffa450edef68