* 'devel' of https://github.com/arangodb/arangodb:
Fixing index markers
exclusive locks for indexes
better incremental sync
grunt build
Avoid log spam.
Removed code paths that wrote objectIds into the Agency. This did break replication.
WAL: honor tick end value
WAL fiter after collection
Reactivated client-side filtering of unnecessary markers
Added an Assert when persisting an index it's objectId is not allowed to be 0
The RestReplicationHandler now inserts new ObjectIds when replicating collections
moved files
add dependencies for TransactionManager
fix include
move engine-specific test into engine test
* 'engine-api' of github.com:arangodb/arangodb:
Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways...
Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc.
Moved useSecondaryIndexes check from Logical to MMFiles collection
Some cleanup in Logical collection imports
Moved index filling into the MMFiles collection
changelog
grunt build
css
ui: queries now using cursors api - issue #2065
remove crosscompile hack - it doesn't work anymore
updated CHANGELOG
add changlog entry for stacktrace log messages
clean up write lockers a bit
fix too early closing of sockets
Moved restoreIndex to Physical collection.
Fix a shell script used during build.
Lower log level to debug in shutdown message.
fix spelling
Moved saveIndex logic into the physical collection
fix potential deadlock
Conflicts:
arangod/MMFiles/MMFilesCollection.cpp
arangod/MMFiles/MMFilesCollection.h
arangod/VocBase/LogicalCollection.cpp