8000 Backup with view by maierlars · Pull Request #10386 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Backup with view #10386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Nov 15, 2019
Merged

Backup with view #10386

Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fc3ff2f
Commit and store view related data on create backup.
Nov 7, 2019
ac87a28
Merge remote-tracking branch 'origin/devel' into feature/backup-views
Nov 11, 2019
b66574a
Fix unit tests.
neunhoef Nov 12, 2019
505efd1
Fix tests.
neunhoef Nov 12, 2019
3fb1486
Fix unit tests.
neunhoef Nov 12, 2019
aedcda4
Merge remote-tracking branch 'origin/devel' into feature/backup-views
neunhoef Nov 13, 2019
40ae1d3
Fixes to upgrade on env-var.
neunhoef Nov 13, 2019
13839d3
Merge remote-tracking branch 'origin/devel' into feature/backup-views
Nov 14, 2019
ae7a3a1
Fixed CMakeLists.txt.
Nov 14, 2019
abd8c5b
Changes to allow restore from 3.5 to 3.6.
neunhoef Nov 14, 2019
0baae98
Merge branch 'feature/backup-views' of ssh://github.com/arangodb/aran…
neunhoef Nov 14, 2019
a9b41ed
Fix test compilation.
neunhoef Nov 15, 2019
a1ac800
Merge remote-tracking branch 'origin/devel' into feature/backup-views
neunhoef Nov 15, 2019
5af5545
Merge branch 'devel' into feature/backup-views
neunhoef Nov 15, 2019
cb78598
FIx compilation.
neunhoef Nov 15, 2019
66a1a09
Remove unnecessary code introduced in merge.
neunhoef Nov 15, 2019
9545a1e
CHANGELOG:
neunhoef Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ else ()
else ()
set (OPENSSL_VERSION_PATTERN ".*OPENSSL_${TARGET_OS}[ ]+\"([^\"a-z]*).*")
endif ()
string(REGEX MATCH
string(REGEX MATCH
"${OPENSSL_VERSION_PATTERN}"
ARANGODB_REQUIRED_OPENSSL_VERSION
"${ARANGODB_VERSIONS_CONTENT}")
Expand Down Expand Up @@ -1382,3 +1382,6 @@ message(STATUS "building for git revision: ${ARANGODB_BUILD_REPOSITORY}")
# message(STATUS "${_variableName}=${${_variableName}}")
# endforeach ()
# endif ()

add_custom_target(arangodb
DEPENDS arangod arangosh arangodump arangoexport arangobackup arangoimport arangorestore)
0