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

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

This commit is contained in:
scottashton 2014-11-20 09:54:28 +01:00
parent a5bc4aaa4a 0692264fe2
commit fc4cbbf41c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/aardvark/frontend/js/modules/org/arangodb/arango-collection.js
View File

@ -209,7 +209,7 @@ var helpArangoCollection = arangosh.createHelpHeadline("ArangoCollection help")
' truncate() delete all documents ' + "\n" +
' properties() show collection properties ' + "\n" +
' drop() delete a collection ' + "\n" +
' load() load a collection into memeory ' + "\n" +
' load() load a collection into memory ' + "\n" +
' unload() unload a collection from memory ' + "\n" +
' rename(<new-name>) renames a collection ' + "\n" +
' getIndexes() return defined indexes ' + "\n" +

2
js/client/modules/org/arangodb/arango-collection.js
View File

@ -208,7 +208,7 @@ var helpArangoCollection = arangosh.createHelpHeadline("ArangoCollection help")
' truncate() delete all documents ' + "\n" +
' properties() show collection properties ' + "\n" +
' drop() delete a collection ' + "\n" +
' load() load a collection into memeory ' + "\n" +
' load() load a collection into memory ' + "\n" +
' unload() unload a collection from memory ' + "\n" +
' rename(<new-name>) renames a collection ' + "\n" +
' getIndexes() return defined indexes ' + "\n" +

2
lib/Statistics/statistics.cpp
View File

@ -502,7 +502,7 @@ StatisticsDistribution* TRI_BytesReceivedDistributionStatistics;
TRI_server_statistics_t TRI_ServerStatistics;
////////////////////////////////////////////////////////////////////////////////
/// @brief physical memeory
/// @brief physical memory
////////////////////////////////////////////////////////////////////////////////
uint64_t TRI_PhysicalMemory;

2
lib/Statistics/statistics.h
View File

@ -280,7 +280,7 @@ extern triagens::basics::StatisticsDistribution* TRI_BytesReceivedDistributionSt
extern TRI_server_statistics_t TRI_ServerStatistics;
////////////////////////////////////////////////////////////////////////////////
/// @brief physical memeory
/// @brief physical memory
////////////////////////////////////////////////////////////////////////////////
extern uint64_t TRI_PhysicalMemory;