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

Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
jsteemann 2017-03-02 22:20:59 +01:00
parent fa2c0c02f1 e6d5058557
commit e1d043e607
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Installation/MacOSX/Bundle/arangodb-cli.sh.in
View File

@ -56,10 +56,10 @@ INFOFILE="/tmp/ArangoDB-CLI.info.$$"
echo "ArangoDB server has been started"
echo ""
echo "The database directory is located at"
echo " '${ROOTDIR}@INC_CPACK_ARANGO_DATA_DIR@'"
echo " '${HOME}@INC_CPACK_ARANGO_DATA_DIR@'"
echo ""
echo "The log file is located at"
echo " '${ROOTDIR}@INC_CPACK_ARANGO_LOG_DIR@/arangod.log'"
echo " '${HOME}@INC_CPACK_ARANGO_LOG_DIR@/arangod.log'"
echo ""
echo "You can access the server using a browser at 'http://127.0.0.1:8529/'"
echo "or start the ArangoDB shell"

2
arangod/RestHandler/RestImportHandler.cpp
View File

@ -1079,7 +1079,7 @@ std::shared_ptr<VPackBuilder> RestImportHandler::createVelocyPackObject(
if (itKeys.size() != itValues.size()) {
errorMsg = positionize(lineNumber) + "wrong number of JSON values (got " +
std::to_string(itKeys.size()) + ", expected " + std::to_string(itValues.size()) + ")";
std::to_string(itValues.size()) + ", expected " + std::to_string(itKeys.size()) + ")";
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER, errorMsg);
}