database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-15 12:09:09 +03:00
Code Activity

Merge branch 'develop' into S3-project

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-08-14 15:37:14 -05:00
parent 73c455c949 4a4d35180a
commit fbdf1a5308
245 changed files with 3356 additions and 3224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
oamapps/postConfigure/postConfigure.cpp
View File

@@ -215,13 +215,11 @@ typedef struct _thread_data_t
int main(int argc, char* argv[])
{
// print a warning if this is a developer build
#ifdef SKIP_OAM_INIT
cout << "SKIP_OAM_INIT is set" << endl;
sleep(2);
#endif
Oam oam;
string parentOAMModuleHostName;
ChildModuleList childmodulelist;
@@ -5397,7 +5395,7 @@ bool storageSetup(bool amazonInstall)
if ( (glusterInstalled == "y" && singleServerInstall != "1") && hadoopInstalled == "y" )
{
cout << "There are 4 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl;
cout << "There are 5 options when configuring the storage: internal, external, DataRedundancy, or hdfs" << endl << endl;
prompt = "Select the type of Data Storage [1=internal, 2=external, 3=DataRedundancy, 4=hdfs] (" + storageType + ") > ";
}