Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #34 from yahoo/aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 12 | -12/+47 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Define include paths and library paths on command line. | Arnstein Ressem | 2016-06-16 | 1 | -5/+3 | |
| * | | | | | | | Remove explicit directories for include and link. | Arnstein Ressem | 2016-06-16 | 1 | -4/+0 | |
| * | | | | | | | Use DEPEND section. | Arnstein Ressem | 2016-06-16 | 1 | -1/+2 | |
| * | | | | | | | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 4 | -69/+189 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| * | | | | | | | Add dl in DEPEND section. | Arnstein Ressem | 2016-06-16 | 3 | -3/+4 | |
| * | | | | | | | Add extra include directory as well. | Arnstein Ressem | 2016-06-16 | 1 | -0/+3 | |
| * | | | | | | | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 6 | -16/+51 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add dl again. | Arnstein Ressem | 2016-06-16 | 1 | -0/+1 | |
| * | | | | | | | | | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 547 | -665/+686 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Merged some of the changes in master. | Arnstein Ressem | 2016-06-16 | 3 | -31/+4 | |
| * | | | | | | | | | | | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 25 | -369/+583 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 4 | -1/+245 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into aressem/vespa-compile-on-centos7 | Arnstein Ressem | 2016-06-16 | 2 | -0/+54 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merging code into new github branch. | Arnstein Ressem | 2016-06-16 | 15 | -15/+79 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #38 from yahoo/arnej/disable-slobrok-failing-test | Arne H Juul | 2016-06-16 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | disable timing-sensitive test | Arne Juul | 2016-06-16 | 1 | -1/+0 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #35 from yahoo/aressem/fix-dependency-issues-when-compilin... | Henning Baldersheim | 2016-06-16 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | These targets depend on configs generated in other ones. | Arnstein Ressem | 2016-06-16 | 2 | -0/+3 | |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #36 from yahoo/vegard/fix-translogserverapp-dependencies | Vegard Sjonfjell | 2016-06-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add weak dependency on storage_visitor | Vegard Sjonfjell | 2016-06-16 | 1 | -0/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #33 from yahoo/arnej/alternate-configserver-start | Jon Bratseth | 2016-06-16 | 1 | -35/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | alternate just-do-it start of configserver | Arne Juul | 2016-06-16 | 1 | -35/+72 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #32 from yahoo/arnej/add-standalone-main | Jon Bratseth | 2016-06-16 | 3 | -34/+117 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | add main() for running without jsvc. | Arne Juul | 2016-06-16 | 3 | -34/+117 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #30 from yahoo/arnej/avoid-spurious-slobrok-error | Henning Baldersheim | 2016-06-16 | 3 | -7/+42 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | more careful checking | Arne Juul | 2016-06-16 | 3 | -7/+42 | |
* | | | | | | | | | | | Merge pull request #31 from yahoo/balder/breakfix-incorrect-include-order-2 | Henning Baldersheim | 2016-06-16 | 3 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Ensure that fastos.h is included first | Henning Baldersheim | 2016-06-16 | 3 | -9/+9 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #25 from yahoo/balder/breakfix-incorrect-include-order | Henning Baldersheim | 2016-06-16 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Ensure that fastos.h is included first | Henning Baldersheim | 2016-06-16 | 1 | -2/+2 | |
* | | | | | | | | | | Merge pull request #22 from yahoo/balder/do-not-run-expensive-tests | Arnstein Ressem | 2016-06-16 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Do not spend huge resources on testing an unused functionality that will not ... | Henning Baldersheim | 2016-06-16 | 1 | -1/+0 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #21 from yahoo/aressem/add-jdisc-container-start-to-rpm | Eirik Nygaard | 2016-06-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Added missing scrip to rpm spec. | Arnstein Ressem | 2016-06-16 | 1 | -0/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #20 from yahoo/vegard/cmake-minor-refactoring | Arnstein Ressem | 2016-06-16 | 1 | -9/+12 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make VALGRIND_UNIT_TESTS a cached variable :) | Vegard Sjonfjell | 2016-06-16 | 1 | -0/+3 | |
| * | | | | | | | | | Moving things around to make it nice | Vegard Sjonfjell | 2016-06-16 | 1 | -9/+9 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #18 from yahoo/vegard/add-author-to-global-cmakelists | Arnstein Ressem | 2016-06-16 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add author to global CMakeLists.txt | Vegard Sjonfjell | 2016-06-16 | 1 | -0/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #14 from yahoo/vegard/optionally-build-unit-tests | Vegard Sjonfjell | 2016-06-16 | 539 | -652/+658 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Declared test executables as tests with TEST parameter | Vegard Sjonfjell | 2016-06-16 | 537 | -644/+644 | |
| * | | | | | | | | Do not build tests as part of all target if EXCLUDE_TESTS_FROM_ALL is set | Vegard Sjonfjell | 2016-06-16 | 2 | -8/+14 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #15 from yahoo/eirik/install-defaults-perl-module | Arnstein Ressem | 2016-06-16 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Include Defaults.pm in rpm | Eirik Nygaard | 2016-06-16 | 1 | -0/+1 | |
| * | | | | | | | Install Defaults.pm | Eirik Nygaard | 2016-06-16 | 1 | -0/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Merge pull request #1 from yahoo/gjoranv/vespajlib-in-jdisc_core | Bjørn Christian Seime | 2016-06-16 | 5 | -3/+12 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Remove preinstall of vespajlib (now provided from jdisc_core). | gjoranv | 2016-06-16 | 1 | -2/+1 |