summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move parent pom to toplevel directoryEirik Nygaard2016-06-23114-2201/+1226
* Merge pull request #143 from yahoo/dybdahl/add-node-type-in-repoHaakon Dybdahl2016-06-2345-138/+360
|\
| * Code review feedback.Haakon Dybdahl2016-06-222-3/+12
| * Simplify code and do not mix rest with persistence.Haakon Dybdahl2016-06-224-58/+17
| * Fix author tag.Haakon Dybdahl2016-06-221-1/+1
| * Add node type.Haakon Dybdahl2016-06-2246-137/+391
* | Merge pull request #178 from yahoo/dybis/export-rest-apiHarald Musum2016-06-237-7/+23
|\ \
| * | Add missing export for OSGI.Haakon Dybdahl2016-06-237-9/+18
| * | Export rest API for OSGI.Haakon Dybdahl2016-06-231-0/+7
|/ /
* | Merge pull request #176 from yahoo/hmusum/remove-yinst-referencehakonhall2016-06-234-7/+7
|\ \
| * | Rename to avoid reference to yinstHarald Musum2016-06-224-7/+7
|/ /
* | Merge pull request #111 from yahoo/dybdahl/node-admin-suspendHarald Musum2016-06-2228-456/+1221
|\ \
| * | Fix spelling.Haakon Dybdahl2016-06-221-1/+1
| * | Code review based improvements.Haakon Dybdahl2016-06-2210-42/+61
| * | Container testing ++Haakon Dybdahl2016-06-2112-76/+331
| * | Add host suspend logic with test and some refactoring.Haakon Dybdahl2016-06-2024-452/+943
* | | Merge pull request #175 from yahoo/aressem/update-documentation-on-how-to-run...Eirik Nygaard2016-06-221-2/+2
|\ \ \
| * | | Noted that it is possible to run with precompiled rpms. Services are accessib...Arnstein Ressem2016-06-221-2/+2
* | | | Merge pull request #154 from yahoo/voffeloff/remove-vespa-core-dumperArne H Juul2016-06-223-40/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove kernel.core_pattern modificationVegard Sjonfjell2016-06-221-4/+0
| * | | Remove /etc/profile editingVegard Sjonfjell2016-06-221-7/+0
| * | | Remove vespa-core-dumper from yahoo/vespaVegard Sjonfjell2016-06-222-29/+0
* | | | Merge pull request #172 from yahoo/musum/parse-vespa-version-responseHarald Musum2016-06-222-1/+49
|\ \ \ \
| * | | | Parse vespa versionHarald Musum2016-06-222-1/+49
* | | | | Merge pull request #174 from yahoo/aressem/hanging-on-logfmt-does-not-work-re...Eirik Nygaard2016-06-221-4/+6
|\ \ \ \ \
| * | | | | logfmt checks if STDIN is open. Needs to explicitly state filename for vespa....Arnstein Ressem2016-06-221-2/+5
| * | | | | Calling logfmt inside this script as part of docker run causes error. Reverti...Arnstein Ressem2016-06-221-4/+3
* | | | | | Merge pull request #173 from yahoo/arnej/add-compare-tutorialsArne H Juul2016-06-221-0/+3
|\ \ \ \ \ \
| * | | | | | add trivial test scriptArne Juul2016-06-221-0/+3
|/ / / / / /
* | | | | | Merge pull request #170 from yahoo/arnej/run-compare-tutorial-as-beforehavardpe2016-06-223-4/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | actually test that tutorial is correctArne H Juul2016-06-223-4/+3
* | | | | | Merge pull request #169 from yahoo/geirst/add-option-to-tune-initialize-threa...Henning Baldersheim2016-06-224-1/+39
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add option to tune number of initialize threads in proton.Geir Storli2016-06-224-1/+39
| | |_|_|/ | |/| | |
* | | | | Merge pull request #168 from yahoo/havardpe/wait-until-at-most-task-countGeir Storli2016-06-223-0/+119
|\ \ \ \ \
| * | | | | enable waiting until there are few enough active tasksHaavard2016-06-223-0/+119
* | | | | | Merge pull request #166 from yahoo/arnej/improve-container-start-script-1Jon Bratseth2016-06-221-20/+98
|\ \ \ \ \ \
| * | | | | | add back some configurable optionsArne Juul2016-06-221-20/+98
| |/ / / / /
* | | | | | Merge pull request #165 from yahoo/bratseth/remove-elk-configMorten Tokle2016-06-2212-227/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unused elk configJon Bratseth2016-06-228-117/+14
| * | | | | Make this work on mac againJon Bratseth2016-06-224-110/+3
* | | | | | Merge pull request #160 from yahoo/aressem/changes-needed-to-get-vespa-runnin...Arnstein Ressem2016-06-223-3/+10
|\ \ \ \ \ \
| * | | | | | Changes needed to get Vespa up and running in Docker.Arnstein Ressem2016-06-223-3/+10
* | | | | | | Merge pull request #161 from yahoo/aressem/add-vespa-container-daemonEirik Nygaard2016-06-221-0/+7
|\ \ \ \ \ \ \
| * | | | | | | New location of the container scipt.Arnstein Ressem2016-06-212-2/+3
| * | | | | | | Merge branch 'master' into aressem/add-vespa-container-daemonArnstein Ressem2016-06-2120-35/+142
| |\ \ \ \ \ \ \
| * | | | | | | | Wrong source pathArnstein Ressem2016-06-211-1/+1
| * | | | | | | | Add script for starting container daemon.Arnstein Ressem2016-06-211-0/+1
| * | | | | | | | Add clustercontroller jars.Arnstein Ressem2016-06-211-0/+5
* | | | | | | | | Merge pull request #162 from yahoo/mortent/update-pom-for-releaseEirik Nygaard2016-06-221-18/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add maven central requirementsMorten Tokle2016-06-221-18/+27
| | |_|_|_|_|/ / / | |/| | | | | | |