summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ignore filesHaavard2016-08-052-0/+2
* Merge pull request #380 from yahoo/toregge/stabilize-unit-testsGeir Storli2016-08-041-2/+6
|\
| * Avoid spurious failures due to threads sometimesTor Egge2016-08-041-2/+6
|/
* Merge pull request #378 from yahoo/vekterli/fix-omitted-private-var-specifierBjørn Christian Seime2016-07-291-1/+1
|\
| * Make member var for blocking queue privateTor Brede Vekterli2016-07-291-1/+1
|/
* Merge pull request #377 from yahoo/vekterli/breakfix-documentapi-javadoc-borkKristian Aune2016-07-281-1/+1
|\
| * Un-break Javadoc buildingTor Brede Vekterli2016-07-281-1/+1
|/
* Merge pull request #376 from yahoo/vekterli/test-and-fix-visitor-data-queueBjørn Christian Seime2016-07-283-38/+170
|\
| * Minor test cleanup from review commentsTor Brede Vekterli2016-07-281-6/+8
| * Replace home-brewed blocking queue with Java's built-in oneTor Brede Vekterli2016-07-281-40/+11
| * Let VisitorDataQueue handle correct wire message types from visitorsTor Brede Vekterli2016-07-283-2/+161
|/
* Merge pull request #375 from yahoo/aressem/cmake-include-hpp-files-in-installBjørn Christian Seime2016-07-261-1/+1
|\
| * Added pattern to include hpp files in make install.Arnstein Ressem2016-07-261-1/+1
|/
* Merge pull request #374 from yahoo/aressem/cmake-install-header-files-correct...Bjørn Christian Seime2016-07-261-10/+18
|\
| * Fix install of headerfiles when src/vespa/name does not match modulename.Arnstein Ressem2016-07-261-10/+18
|/
* Merge pull request #366 from yahoo/aressem/move-post-install-steps-into-separ...Arne H Juul2016-07-253-62/+74
|\
| * Need to create sbin.Arnstein Ressem2016-07-211-4/+1
| * Wrong variable name after refactoring.Arnstein Ressem2016-07-211-43/+43
| * Only use DESTDIR in post_install.shArnstein Ressem2016-07-211-1/+1
| * Separated post_install script from vespa.spec.Arnstein Ressem2016-07-212-107/+43
| * Preliminary checkin.Arnstein Ressem2016-07-202-0/+79
* | Merge pull request #373 from yahoo/arnej/retry-in-cache-testBjørn Christian Seime2016-07-251-4/+16
|\ \
| * | add retries in timing-dependent testArne H Juul2016-07-251-4/+16
|/ /
* | Merge pull request #372 from yahoo/freva/allow-suspend-noneArnstein Ressem2016-07-252-1/+10
|\ \
| * | Allow Orchestrator to suspend node admin with no active nodesvalerijf2016-07-252-1/+10
* | | Merge pull request #371 from yahoo/freva/update-maintainer-locationArnstein Ressem2016-07-251-1/+1
|\ \ \ | |/ / |/| |
| * | Maintenance script was pointing at the old location of Maintainervalerijf2016-07-251-1/+1
* | | Merge pull request #370 from yahoo/aressem/cmake-install-header-filesBjørn Christian Seime2016-07-251-0/+13
|\ \ \ | |/ / |/| |
| * | Install header files as part of make install.Arnstein Ressem2016-07-251-0/+13
| |/
* | Merge pull request #369 from yahoo/freva/fix-node-admin-prefix-logger-warninghakonhall2016-07-221-3/+3
|\ \
| * | Fix missing type arguments for generic class java.lang.Class<T>valerijf2016-07-221-3/+3
|/ /
* | Merge pull request #368 from yahoo/freva/node-admin-consitent-logging-2freva2016-07-229-90/+149
|\ \
| * | Merged with mastervalerijf2016-07-221-4/+1
| * | Made log() with Throwable also privatevalerijf2016-07-228-27/+32
| * | Removed severe, added error and made general log() privatevalerijf2016-07-225-11/+12
| * | Added info, warning and severe log functions to PrefixLoggervalerijf2016-07-227-26/+36
| * | msg -> messagevalerijf2016-07-221-4/+4
| * | Changed PrefixLogger constructor to take in Class instead of String as logger...valerijf2016-07-229-26/+25
| * | Converted all node admin prefix loggers to staticvalerijf2016-07-224-14/+14
| * | All node-admin classes now use PrefixLogger for loggingvalerijf2016-07-229-45/+60
| * | Added PrefixLogger to DockerOperationsvalerijf2016-07-222-6/+7
| * | Created prefix logging to enable more consistent log messages across classesvalerijf2016-07-225-27/+58
|/ /
* | Merge pull request #367 from yahoo/freva/maintenance-relative-path-fixfreva2016-07-224-40/+72
|\ \
| * | Save absolutePathInNode to Path to avoid bringing in Filevalerijf2016-07-221-4/+6
| * | Relativize and resolve paths isntead of Paths.get()valerijf2016-07-221-5/+8
| * | Renamed path translation functionsvalerijf2016-07-224-42/+58
| * | Fixed bug with generating path relative to node storage (previously interpret...valerijf2016-07-213-8/+19
* | | Merge pull request #365 from yahoo/freva/node-repo-rest-hide-empty-vespa-versionfreva2016-07-215-2/+40
|\ \ \ | |/ / |/| |
| * | Do not display vespaVersion if its string is emptyvalerijf2016-07-211-1/+3
| * | Merge remote-tracking branch 'origin/master'valerijf2016-07-2026-330/+410
| |\ \ | |/ / |/| |