Squashed 'core/' changes from 3fc105e..e29bb4d

e29bb4d Update CHANGELOG.md
a55da45 Merge branch 'develop' of github.com:syncany/syncany into develop
e1cb6f9 Fixes #288
67bc7be Add test to reproduce #288
3c1fe6e Homebrew formula update
7849304 Add homebrew to install launchagents
b3ab761 Changelog update: Homebrew issue
428f5bd Merge branch 'develop' of https://github.com/syncany/syncany into feature/osx-integration
ae1a1cd Merge branch 'develop' of https://github.com/syncany/syncany into develop
40bde8b Cutting out --no-merge-databases
9f2045e Update CHANGELOG.md
06fc215 Changelogging the change of the month
477b921 Merge pull request #284 from syncany/bugfix/cleanup-checkpoint
5209fb4 Merge branch 'develop' into bugfix/cleanup-checkpoint
f8cdab8 Typos
1634575 Adding new lines, adding meaningful variable names
9f6b5c0 Adding author to DatabaseReconciliator
09f05dc Update DatabaseReconciliator javadoc example
e51abfd Fix expected output of test (needs checking)
a10f88d Fix expected output
752cf0f Functional rework of DatabaseReconciliator to not crash on gaps and such. This commit is dedicated to that one coach that would NOT shut up about topological sort.
928c32e OSX: Copy launchdaemon during fake install
ab76045 OSX launchdaemon and homebrew formula
a0f66fc Add more logging output, correct branch of client 'ZA' in test; relates to #266
6da866d Merge branch 'bugfix/cleanup-checkpoint' of github.com:syncany/syncany into bugfix/cleanup-checkpoint
1ffa143 Reproduce Pim's test case from #266
a24989a Small test fixes
8c8b456 Documenting UNCOMMITTED READ
50d0136 Fix last remaining cleanup bug (remove deleted known_databases)
64da122 Bump version (database layout breaks with 0.2.0)
fda0d8c Actually write cleanupTime/cleanupNumber; write to database instead of state/ folder
94f0d31 Second down cleans up again, see clientE
9a0076f Fix tests, remove 'type' attribute from 'databaseversion' table
d791d54 Extend numbering test; breaks again ...
c8f8026 Implement 'no database versions' vector clock, see #266
ca70d44 Merge branch 'bugfix/cleanup-checkpoint' of https://github.com/syncany/syncany into bugfix/cleanup-checkpoint
9ca4126 Tiny bit of documentation
4191ba4 Adding/removing new lines
252f295 Remove DatabaseVersionType (DEFAULT) from code base
5280d50 Merge branch 'bugfix/cleanup-checkpoint' into bugfix/cleanup-checkpoint-delete-not-in-winner
97994da Check database
af1d19b Patching numbers in tests
d748884 Assumption: no local databaseversionheaders implies all remote databases are unknown is false. If all databaseversions are deleted, remote database files might be known, but empty.
c0d3f50 Cont'd #266: Now successfully deleting local files that were cleaned up; however, next 'up' still fails.
ab41357 Only compare old local branch with winner when cleanup occurred
bb76037 Begin solving #266 delete-not-in-winner issue (work in progress, syntax errors)
40db21a Remove more PURGE database stuff
9ff9427 Formatting
0b0ac4e Merge branch 'bugfix/cleanup-checkpoint' into bugfix/cleanup-checkpoint-nullfix
5c89411 Another cleanup issue: delete-file-then-cleanup leads to files not being deleted on other clients. #266
8ddbc31 Attempting to solve nullpointer exception from #266
8b69297 Reproduce #266 / empty database after issue / see https://github.com/syncany/syncany/issues/266#issuecomment-64472059
a25a8da Simplification of DatabaseReconciliator, adjusting JavaDoc, relates to #266
ed8ac65 New stitch, remove findCommon/findFirstConflicting/... in favor of former 'winners-winner' algorithm; works with #266 issue; solves VC1-VC2 issue in #266
56ab331 New stitch, almost working; passes #266 issue
3b60a7c Alternative stitching
ed3d4ea Reproduce #266 as per https://github.com/syncany/syncany/issues/266#issuecomment-64228633
dbe2849 Easy fix for withSuffix (more than 10 conflicts in a minute)
304c5c8 Decoupling vectorclocks and db file numbers: LsRemote
c888f29 Removing lost code
8a90448 Code deduplication/refactoring: cleanup numbers
c8c0c89 Extra code for cleanup behavior, fix test
f6b63dc Deleting known_databases on fresh cleanup, for consistency and because we can
00efb76 Merge branch 'bugfix/cleanup-checkpoint-needs-merge-fix' into bugfix/cleanup-checkpoint
579d7d9 Fixes needMerge() and a few tests
dd3e932 Refactoring mergeRemoteDatabases (NOTE: stalls test testIssue58_2 due to HSQLDB issues)
a5ddaa2 Move didPurge to inside mergeDatabaseFiles
122db17 Document cleanTransactions return
a49e155 Make Docker footprint smaller
411e780 Removing savepoint, inverting cleanTransactions logic
e821b3c Commenting getHighestDatabaseFileVersion
1544faa Refactoring: Moving getHighestKnownDatabaseVersion to AbstractTransferOperation
f03ef42 Fix queries to check for chunks in dbvs as well and fix numbers in test to reflect new situation
1f9a841 Trying to fix issue #208, no success; CleanupMergeDatabaseFilesScenarioTest fails
eff6ad3 Adding cleanup fails -> block repo tests
93968b2 Patching tests and converting prints to logs
f3a33fb Not reversing transactions with transactions and patching corresponding test
f34d8fe Removing tests for non-existing purge dbvs
76557a6 Patching tests
cf0ec93 Fixing tests and making deleting fail not impact the success of the transaction
15bb3ac Switching committing in between around with uncommitted read
e32c31c Saving/loading localDatabase during down and up
bfcabf0 Patching tests and saving/loading localdatabase when operation fails
2c70898 Signalling cleanup with cleanup file
e64f95c Uploading cleanup-<number> file to indicate cleanup has occurred
fbf2298 Committing local database in UpOperation
63695d8 Simplifying SQL query
3a7cde0 Various fixes, databasefile version numbers and SQL-query to get database versions up to a client version
1863d95 Intial attempt at refactoring readWinnersDatabase()
5b957d6 Merging on too many database files
25642ab Merge branch 'bugfix/cleanup-checkpoint-nopurge' into bugfix/cleanup-checkpoint
1d86b16 Ripping out more stuff
8b5f4b7 Patching test, db-X-numbers
268f50c Update CHANGELOG.md
508d8d9 Not including local branch when stitching
9f01b08 Bit of logging
9883367 Merge pull request #271 from cr0/feature/remove-writexml
daf7175 Removed generic writeXml methods
de99f23 Attempting to rip out purge
912e5c9 No longer using purge databases
e1ea1ab Update changelog
a4dc03f Merge branch 'feature/issue256' into develop
a8530f3 Implement rest of non-interactive --password option; remove --insecure
a66540b Merge branch 'develop' into feature/issue256
c6155e9 Update CHANGELOG.md
6210775 Move commit for clarity
723409f Fixing Windows/CMD compatibility issue #270
2effa3c Revert "Rolling back local database if down fails"
1df2f19 Rolling back local database if down fails
22c3197 Not committing to enable rollbacks
583ee58 Null pointer safety
25ff5a9 Commenting persisting the dummy databaseversion
22f447a Persisting dummy database version on cleaning client
eebcdcf Ending a range if clock difference is not 1
a147708 Correcter ordering of operations (?)
0a0a7c7 Deleting local database if cleanup has occured elsewhere
52a8e32 Write help page for --password
dfc334c Remembering newly uploaded database versions
42e2412 Make 'sy connect --password' work
2182d00 Continue work on --password option
7cf53cf Patching tests by bumping numbers
a994241 Inserting vector clock dummy databaseversion to keep numbers in tact
bb9d170 Allow setting password during 'sy init'
0028eec Fix GenlinkCommandTest
e1b8896 Merge branch 'develop' of github.com:syncany/syncany into develop
4c15c12 Merge branch 'feature/bash-completion' into develop
574477f Bumping PKGBUILD
9ca3dfb Update bashcompletion and cleanup help text
ec026d8 Make dynamic RAID0 options (with sub plugins)
c992fdb Add --short option and new plugins to bash completion
5f114f6 Bump version
993fcfa Merge tag 'v0.2.0-alpha' into develop
79f002c Merge branch 'release/0.2.0-alpha'
411895a Merge branch 'develop' of github.com:syncany/syncany into develop
5e9312a Merge tag 'v0.2.0-alpha' into develop
19a25af Merge branch 'release/0.2.0-alpha'
0a558be Add release date to changelog
69130d8 Update CHANGELOG.md
808045f Merge branch 'release/0.1.12-alpha'
af59537 Merge branch 'release/0.1.11-alpha'
ed18574 Merge branch 'release/0.1.10-alpha'

git-subtree-dir: core
git-subtree-split: e29bb4d8b29400d2752a01d7b395c84b6c6e7ea0
Merge commit '907b4562e6c1c5c852a2bb4c3de904f39095d9d9' into develop
Merge branch 'develop' of github.com:syncany/syncany-plugin-dropbox into develop
Merge branch 'develop' of github.com:syncany/syncany-plugin-dropbox into develop
Update changelog
Squashed 'core/' changes from e29bb4d..9e84dd0

9e84dd0 Merge tag 'v0.3.0-alpha' into develop
c05fabb Merge branch 'release/0.3.0-alpha'
3fcc3cb Update changelog date for release
7d5b547 Merge branch 'develop' of github.com:syncany/syncany into develop
a448771 Remove obsolete database_name field

git-subtree-dir: core
git-subtree-split: 9e84dd0d23229d1d7f4d2cf201107cabefd97bec
Merge commit 'a1209c64efdbd64486d777a3af625c6f6e24c311' into develop
Merge branch 'release/plugin-dropbox/v0.3.0-alpha'
Merge tag 'vplugin-dropbox/v0.3.0-alpha' into develop

Syncany Dropbox Plugin v0.3.0-alpha