| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Find merge in new tools/ dir. | Linus Nordberg | 2017-09-06 | 1 | -1/+1 |
| | | |||||
| * | Make 'install' too, which installs tools directory. | Linus Nordberg | 2017-09-06 | 2 | -8/+2 |
| | | | | | | | | Stop moving the source dir to INSTDIR -- make install does what's needed. Use getconfig.sh in INSTDIR/tools/. | ||||
| * | Remove spurious MERGE_DB_DIR setting. | Linus Nordberg | 2017-08-31 | 1 | -1/+0 |
| | | | | | The same thing is done in merge.sh. | ||||
| * | Add role 'status' for statusservers. | Linus Nordberg | 2017-08-31 | 1 | -0/+4 |
| | | |||||
| * | Parameterise -boot argument to run_erl. | Linus Nordberg | 2017-02-21 | 1 | -8/+9 |
| | | | | | Less duplication. | ||||
| * | Use getconfig.sh and run new Erlang based merge too. | Linus Nordberg | 2017-02-21 | 1 | -24/+11 |
| | | |||||
| * | Follow move of catlfish source. | Linus Nordberg | 2017-02-21 | 1 | -2/+2 |
| | | |||||
| * | Remove spurious comment. | Linus Nordberg | 2017-02-21 | 1 | -2/+0 |
| | | |||||
| * | Move catlfish source directory. | Linus Nordberg | 2017-02-21 | 1 | -0/+3 |
| | | |||||
| * | Install python-requests. | Linus Nordberg | 2017-02-21 | 1 | -2/+2 |
| | | | | | merge_fetch.py needs it. | ||||
| * | Merge remote-tracking branch 'refs/remotes/map/permdb' | Linus Nordberg | 2017-02-01 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: catlfish-dev/Dockerfile | ||||
| | * | Add packages necessary for new permdb implementation | Magnus Ahltorp | 2016-03-02 | 1 | -1/+1 |
| | | | |||||
| * | | Use newer versions of lager and mochiweb. | Linus Nordberg | 2016-12-05 | 1 | -5/+5 |
| | | | | | | | | | Addresses CATLFISH-70. | ||||
| * | | Add two dependencies. | Linus Nordberg | 2016-12-05 | 1 | -2/+2 |
| | | | |||||
| * | | curl -s for some silence | Linus Nordberg | 2016-07-17 | 1 | -7/+7 |
| | | | |||||
| * | | Need Python.h for permdb. | Linus Nordberg | 2016-07-16 | 1 | -1/+1 |
| | | | |||||
| * | | Need libnettle, libbsd and librhash for permdb. | Linus Nordberg | 2016-07-16 | 1 | -2/+2 |
| |/ | |||||
| * | merge.py is gone, long live merge. | Linus Nordberg | 2015-11-19 | 1 | -4/+4 |
| | | |||||
| * | Fix a typo in ERL_LIBS path to plop. | Linus Nordberg | 2015-08-25 | 1 | -5/+6 |
| | | | | | | Also, handle lager like catlfish and plop, i.e. find out its version number instead of using a static string. | ||||
| * | No need to symlink /usr/local/etc/catlfish/catlfish.config. | Linus Nordberg | 2015-06-12 | 1 | -1/+0 |
| | | |||||
| * | Pass $MERGE_EXTRA_ARGS. | Linus Nordberg | 2015-06-12 | 1 | -1/+2 |
| | | |||||
| * | Node name is second arg, not third. | Linus Nordberg | 2015-06-12 | 1 | -2/+2 |
| | | |||||
| * | Fix paths for catlfish config file. Don't use CATLFISH_DB_DIR. | Linus Nordberg | 2015-06-12 | 1 | -9/+9 |
| | | |||||
| * | verifycert depends on plop too. | Linus Nordberg | 2015-06-10 | 1 | -3/+6 |
| | | |||||
| * | Don't rebuild config file if it exists. | Linus Nordberg | 2015-06-01 | 1 | -4/+12 |
| | | |||||
| * | Initial commit. | Linus Nordberg | 2015-05-26 | 4 | -0/+169 |
