summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix owner files.Haakon Dybdahl2016-06-1718-18/+18
* Merge pull request #39 from yahoo/balder/cleanup-messagebus-build-messHenning Baldersheim2016-06-172-2/+0
|\
| * Remove what I do not understandHenning Baldersheim2016-06-171-1/+0
| * Do not do the job of messagebus_testHenning Baldersheim2016-06-171-1/+0
|/
* Merge pull request #16 from yahoo/eirik/update-authorJon Bratseth2016-06-161-1/+1
|\
| * Update authorEirik Nygaard2016-06-161-1/+1
* | Merge pull request #34 from yahoo/aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-1612-12/+47
|\ \
| * | Define include paths and library paths on command line.Arnstein Ressem2016-06-161-5/+3
| * | Remove explicit directories for include and link.Arnstein Ressem2016-06-161-4/+0
| * | Use DEPEND section.Arnstein Ressem2016-06-161-1/+2
| * | Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-164-69/+189
| |\ \
| * | | Add dl in DEPEND section.Arnstein Ressem2016-06-163-3/+4
| * | | Add extra include directory as well.Arnstein Ressem2016-06-161-0/+3
| * | | Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-166-16/+51
| |\ \ \
| * \ \ \ Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-161-2/+2
| |\ \ \ \
| * | | | | Add dl again.Arnstein Ressem2016-06-161-0/+1
| * | | | | Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-16547-665/+686
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-161-0/+1
| |\ \ \ \ \ \
| * | | | | | | Merged some of the changes in master.Arnstein Ressem2016-06-163-31/+4
| * | | | | | | Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-1625-369/+583
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-164-1/+245
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into aressem/vespa-compile-on-centos7Arnstein Ressem2016-06-162-0/+54
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merging code into new github branch.Arnstein Ressem2016-06-1615-15/+79
* | | | | | | | | | | Merge pull request #38 from yahoo/arnej/disable-slobrok-failing-testArne H Juul2016-06-161-1/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | disable timing-sensitive testArne Juul2016-06-161-1/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #35 from yahoo/aressem/fix-dependency-issues-when-compilin...Henning Baldersheim2016-06-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | These targets depend on configs generated in other ones.Arnstein Ressem2016-06-162-0/+3
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #36 from yahoo/vegard/fix-translogserverapp-dependenciesVegard Sjonfjell2016-06-161-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add weak dependency on storage_visitorVegard Sjonfjell2016-06-161-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #33 from yahoo/arnej/alternate-configserver-startJon Bratseth2016-06-161-35/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | alternate just-do-it start of configserverArne Juul2016-06-161-35/+72
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #32 from yahoo/arnej/add-standalone-mainJon Bratseth2016-06-163-34/+117
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | add main() for running without jsvc.Arne Juul2016-06-163-34/+117
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #30 from yahoo/arnej/avoid-spurious-slobrok-errorHenning Baldersheim2016-06-163-7/+42
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | more careful checkingArne Juul2016-06-163-7/+42
* | | | | | | | | | Merge pull request #31 from yahoo/balder/breakfix-incorrect-include-order-2Henning Baldersheim2016-06-163-9/+9
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Ensure that fastos.h is included firstHenning Baldersheim2016-06-163-9/+9
|/ / / / / / / / /
* | | | | | | | | Merge pull request #25 from yahoo/balder/breakfix-incorrect-include-orderHenning Baldersheim2016-06-161-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Ensure that fastos.h is included firstHenning Baldersheim2016-06-161-2/+2
* | | | | | | | | Merge pull request #22 from yahoo/balder/do-not-run-expensive-testsArnstein Ressem2016-06-161-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Do not spend huge resources on testing an unused functionality that will not ...Henning Baldersheim2016-06-161-1/+0
* | | | | | | | | Merge pull request #21 from yahoo/aressem/add-jdisc-container-start-to-rpmEirik Nygaard2016-06-161-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added missing scrip to rpm spec.Arnstein Ressem2016-06-161-0/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20 from yahoo/vegard/cmake-minor-refactoringArnstein Ressem2016-06-161-9/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make VALGRIND_UNIT_TESTS a cached variable :)Vegard Sjonfjell2016-06-161-0/+3
| * | | | | | | | | Moving things around to make it niceVegard Sjonfjell2016-06-161-9/+9
| |/ / / / / / / /
* | | | | | | | | Merge pull request #18 from yahoo/vegard/add-author-to-global-cmakelistsArnstein Ressem2016-06-161-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add author to global CMakeLists.txtVegard Sjonfjell2016-06-161-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #14 from yahoo/vegard/optionally-build-unit-testsVegard Sjonfjell2016-06-16539-652/+658
|\ \ \ \ \ \ \ \
| * | | | | | | | Declared test executables as tests with TEST parameterVegard Sjonfjell2016-06-16537-644/+644