RavenDB-2590 Starting to implement server side conflict resolution for file systems (WIP- all tests green)
RavenDB-2590 Adding built-in resolvers. Problems with LocalFileSynchronizationConflictResolver because of date time format in raven-last-modification metadata
Fixing formatting issue which caused that ravenfs wasn't able to properly parse the date what is needed to resolve conflicts by using a newer file based on raven-last-modified
Fixing incremental backup tests. When you set settings value by using Settings dict you have to call Initialize after that.
Merge branch 'incremental-backup-failing-tests' of https://github.com/arekais/ravendb
RavenDB-2603 Studio - debug info package - file name
increased MaxScratchBufferSize to 1GB in voron recovery tests
Merge branch 'master' of https://github.com/ppekrol/ravendb
Merge branch 'RavenDB_2603' of https://github.com/ml054/ravendb
RavenDB-2590 Checking a conflict resolution by asking a destination server if conflict can be resolved there by using built-in resolvers
RavenDB-2590 Adding tests
Merge branch 'master' of git://github.com/ayende/ravendb into RavenDB-2590
Fixing typo. Aggressively inline internal method.
removed the ability to setup performance counters
Merge branch 'master' of https://github.com/ppekrol/ravendb
Getting rid of call of the internal NewTransaction method
Merge branch 'master' of git://github.com/ayende/ravendb into RavenDB_2599