summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1548 from ferd/tpl-license-matches-defaultTristan Sloughter2017-05-193-31/+193
|\
| * Switch default license to Apache 2.0Fred Hebert2017-05-193-31/+193
| * Match template license app to default licenseFred Hebert2017-05-142-2/+2
* | Merge pull request #1513 from alinpopa/masterTristan Sloughter2017-05-191-9/+7
|\ \
| * | Fix git SHAs comparison for update.Alin Popa2017-03-121-9/+7
* | | Merge pull request #1520 from lrascao/feature/relx_warnings_as_errorsTristan Sloughter2017-05-191-2/+4
|\ \ \
| * | | Let relx know about application erl optsLuis Rascao2017-05-151-2/+4
* | | | Merge pull request #1553 from filmor/patch-1Fred Hebert2017-05-171-1/+1
|\ \ \ \
| * | | | Use rm_rf instead of ec_file:delete.Benedikt Reinartz2017-05-171-1/+1
|/ / / /
* | | | Merge pull request #1552 from lrascao/travis_otp19.3_buildFred Hebert2017-05-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Run Travis tests on latest OTP19.3Luis Rascao2017-05-151-1/+1
|/ / /
* | | Merge pull request #1546 from ferd/cth-end-per-tc-fixalisdair sullivan2017-05-143-4/+4
|\ \ \ | |_|/ |/| |
| * | Bump cth_readable to 1.2.6Fred Hebert2017-05-123-4/+4
|/ /
* | Merge pull request #1545 from ferd/catch-ct-internal-errorsalisdair sullivan2017-05-111-2/+9
|\ \
| * | Handle internal CT failuresFred Hebert2017-05-111-2/+9
|/ /
* | Merge pull request #1544 from ferd/tpodowd-issue1416Fred Hebert2017-05-112-2/+27
|\ \
| * | Add tests for the first_files profile mergesFred Hebert2017-05-111-2/+23
| * | Issue #1416: Merge erl_files_first separately and avoid sorting.Thomas O'Dowd2017-05-111-0/+4
|/ /
* | Merge pull request #1542 from ferd/bump-cth-readable-1.2.5Fred Hebert2017-05-072-3/+3
|\ \
| * | Adds support for new ct hook callbackFred Hebert2017-05-072-3/+3
|/ /
* | Merge pull request #1541 from erlang/drop-r15alisdair sullivan2017-05-042-5/+0
|\ \
| * | Drop R15 supportFred Hebert2017-05-032-5/+0
|/ /
* | Merge pull request #1536 from djnym/allow-color-noneFred Hebert2017-04-261-0/+2
|\ \
| * | REBAR_COLOR supports all ec_cmd_log intensity optionsAnthony Molinaro2017-04-261-0/+2
|/ /
* | Merge pull request #1534 from ferd/abuse-undef-functionsFred Hebert2017-04-252-7/+29
|\ \
| * | Abuse error_handler to get free metacalls in r3Fred Hebert2017-04-242-7/+29
|/ /
* | Merge pull request #1528 from lrascao/fix/occured_typoTristan Sloughter2017-04-122-2/+2
|\ \
| * | Fix typo, occured -> occurredLuis Rascao2017-04-122-2/+2
|/ /
* | Merge pull request #1524 from lrascao/feature/bump_relx_3_22_4Fred Hebert2017-03-272-3/+3
|\ \
| * | Bump relx to 3.22.4Luis Rascao2017-03-282-3/+3
|/ /
* | Merge pull request #1523 from mbeijen/separateFred Hebert2017-03-277-42/+42
|\ \
| * | Typo: seperate -> separateMichiel Beijen2017-03-277-42/+42
|/ /
* | Back to git-based versioningFred Hebert2017-03-231-1/+1
* | Bump to 3.3.6Fred Hebert2017-03-232-2/+2
* | Merge pull request #1471 from talentdeficit/travis-osxFred Hebert2017-03-221-11/+20
|\ \
| * | update travis.yml to test on osxalisdair sullivan2017-02-051-11/+20
* | | Merge pull request #1518 from tsloughter/relx-3.22.3Fred Hebert2017-03-212-3/+3
|\ \ \
| * | | upgrade relx to 3.22.3Tristan Sloughter2017-03-202-3/+3
* | | | Merge pull request #1516 from talentdeficit/fix_eunit_suiteFred Hebert2017-03-191-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | eunit in 19.3 errors if `init_per_*` isn't paired with `end_per_*`alisdair sullivan2017-03-181-1/+4
|/ / /
* | | Merge pull request #1511 from vladdu/patch-2alisdair sullivan2017-03-061-2/+2
|\ \ \
| * | | fix "apps" nameVlad Dumitrescu2017-03-061-1/+1
| * | | minor fix: name of internal functionVlad Dumitrescu2017-03-061-3/+3
* | | | Merge pull request #1512 from erlang/revert-1508-patch-1alisdair sullivan2017-03-061-3/+0
|\ \ \ \
| * | | | Revert "List 'lock' command in man page"alisdair sullivan2017-03-061-3/+0
|/ / / /
* | | | Merge pull request #1508 from vladdu/patch-1alisdair sullivan2017-03-061-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | List 'lock' command in man pageVlad Dumitrescu2017-03-061-0/+3
|/ / /
* | | Merge pull request #1506 from sirihansen/ct-single-testspecFred Hebert2017-03-062-14/+54
|\ \ \
| * | | Allow single test spec in ct_optsSiri Hansen2017-03-062-14/+54
|/ / /
* | | Merge pull request #1505 from colrack/inetsdepfixalisdair sullivan2017-03-051-1/+1
|\ \ \