Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding

This commit is contained in:
Jan Steemann 2014-02-26 11:02:19 +01:00
parent 96938512c1 86faf20dbb
commit 99a4db23f2
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UnitTests/Makefile.unittests
View File

@ -358,7 +358,7 @@ SHELL_COMMON = \
@top_srcdir@/js/common/tests/shell-collection.js \
@top_srcdir@/js/common/tests/shell-collection-volatile.js \
@top_srcdir@/js/common/tests/shell-crypto.js \
@top_srcdir@/js/common/tests/shell-database.js \
@top_srcdir@/js/common/tests/shell-noncluster-database.js \
@top_srcdir@/js/common/tests/shell-document.js \
@top_srcdir@/js/common/tests/shell-download.js \
@top_srcdir@/js/common/tests/shell-edge.js \
@ -387,8 +387,8 @@ SHELL_COMMON = \
SHELL_SERVER_ONLY = \
@top_srcdir@/js/server/tests/shell-sharding-helpers.js \
@top_srcdir@/js/server/tests/shell-compaction.js \
@top_srcdir@/js/server/tests/shell-transactions.js \
@top_srcdir@/js/server/tests/shell-noncluster-compaction.js \
@top_srcdir@/js/server/tests/shell-noncluster-transactions.js \
@top_srcdir@/js/server/tests/shell-routing.js \
@top_srcdir@/js/server/tests/shell-any.js \
@top_srcdir@/js/server/tests/shell-bitarray-index.js \

0
js/server/tests/shell-compaction.js → js/server/tests/shell-noncluster-compaction.js
View File

0
js/server/tests/shell-transactions.js → js/server/tests/shell-noncluster-transactions.js
View File