summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #74 from DeadZen/dz-merged-overlayDave Smith2013-06-141-8/+18
|\ | | | | Implement merged overlays
| * Implement merged overlaysPedram Nimreezi2013-03-261-8/+18
| | | | | | | | This allows overlay_vars to merge comma delimited var config files
* | Merge pull request #54 from mattonrails/simpleapp_sup_template_typoDave Smith2013-06-141-1/+0
|\ \ | | | | | | Remove leading empty line from a template
| * | Remove leading empty line from a templateMatthew Conway2013-01-141-1/+0
| | |
* | | Merge pull request #97 from tuncer/simplenode-syncDave Smith2013-06-125-66/+210
|\ \ \ | | | | | | | | Sync test/upgrade_project/rel/files with priv/templates
| * | | Sync test/upgrade_project/rel/files with priv/templatesTuncer Ayaz2013-06-125-66/+210
|/ / /
* | | Merge pull request #96 from olgeni/pwd-symlink-fixDave Smith2013-06-124-4/+4
|\ \ \ | | | | | | | | Use "pwd -P" to get the current physical path.
| * | | Use "pwd -P" to get the current physical path.olgeni2013-06-104-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is a portable version of the realpath(1) utility that you can find on Mac OS X and FreeBSD (see also The Open Group Base Specifications Issue 6, IEEE Std 1003.1). Without the -P flag, pwd(1) might return different values when the current path contains one or more symlinks, depending on how you got into the current directory. In simplenode.runner, this may cause PIPE_DIR to have different values on each use, which will make it impossible to connect to the running node unless you guess the correct path yourself.
* | | | Merge pull request #75 from rpt/masterDave Smith2013-06-121-0/+1
|\ \ \ \ | | | | | | | | | | Support for QuickCheck Mini
| * | | | Add support for QuickCheck MiniKrzysztof Rutka2013-03-251-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #91 from syl20bnr/ping-command-for-windowsDave Smith2013-06-122-2/+12
|\ \ \ \ | |_|/ / |/| | | Add support for ping command on windows in the simple node runner
| * | | Add support for ping command on windows in the simple node runnersyl20bnr2013-05-202-2/+12
| | | |
* | | | Merge pull request #90 from Motiejus/dep_pluginDave Smith2013-05-215-17/+82
|\ \ \ \ | |/ / / |/| | | Fix searching for plugins
| * | | Fix searching for pluginsMotiejus Jakštys2013-05-195-17/+82
| | | | | | | | | | | | | | | | | | | | If a plugin is in a dependency, rebar didn't search for it carefully enough.
* | | | Merge branch 'master' of git://github.com/ferd/rebar into ferd-masterDave Smith2013-05-151-4/+22
|\ \ \ \
| * | | | Handle ct_run exit codes in R15B02 and laterFred Hebert2013-04-181-4/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since R15B02, ct_run returns a non-zero exit code when some tests failed or were auto-skipped. (See ticket OTP-9865.) This fix makes it so a non-0 code doesn't cause an instant failure, but still prompts for log verification before doing so. Given the behaviour was acceptable for pre-R15B02, it should be valid with it with post-R15B02. The fix should also be backwards compatible.
* | | | Merge pull request #85 from ratelle/rebar-deps-dir-in-port-compilerDave Smith2013-05-151-1/+2
|\ \ \ \ | | | | | | | | | | Add rebar-deps env to port compiler SharedEnv
| * | | | Add rebar-deps env to port compiler SharedEnvJeremie Lasalle Ratelle2013-05-061-1/+2
|/ / / / | | | | | | | | | | | | | | | | REBAR_DEPS_DIR is often needed when a nif needs to be linked with a raw dependency.
* | | | Merge pull request #83 from rebar/travisci-fixesDave Smith2013-04-232-4/+16
|\ \ \ \ | | | | | | | | | | Travisci fixes
| * | | | Adding R16B to travis buildDave Smith2013-04-231-0/+1
| | | | |
| * | | | Additional travisci fixesDave Smith2013-04-231-4/+15
|/ / / /
* | | | Adding user/email on created repos for travis CIDave Smith2013-04-221-0/+2
| | | |
* | | | Further investigation into travis CI issuesDave Smith2013-04-221-3/+12
| | | |
* | | | Add author to fix issue when compiling on travisDave Smith2013-04-221-1/+1
| | | |
* | | | Enable verbose output from retestDave Smith2013-04-221-1/+1
| | | |
* | | | Merge pull request #80 from tuncer/nodetool-no_compileDave Smith2013-04-211-2/+0
|\ \ \ \ | |/ / / |/| | | Do not compile nodetool escript
| * | | Do not compile nodetool escriptTuncer Ayaz2013-04-121-2/+0
|/ / / | | | | | | | | | This removes the dependency on lib/compiler in an OTP release.
* | | Merge pull request #81 from massemanet/patch-1Dave Smith2013-04-121-0/+2
|\ \ \ | | | | | | | | More error logging
| * | | More error loggingmats cronqvist2013-04-121-0/+2
|/ / / | | | | | | rebar throws away some error messages, e.g. the ones generated if the yecc compiler is broken.
* | | Merge pull request #43 from tuncer/reltool-mod_condDave Smith2013-04-101-1/+0
|\ \ \ | | | | | | | | simplenode.reltool.config: use default sys-level mod_cond setting
| * | | simplenode.reltool.config: use default sys-level mod_cond settingTuncer Ayaz2013-04-061-1/+0
| |/ / | | | | | | | | | | | | | | | As discussed here http://erlang.org/pipermail/erlang-questions/2012-December/071135.html change the reltool spec to use the default sys-level mod_cond setting.
* | | Merge pull request #66 from tuncer/dialyzer-no_nativeDave Smith2013-04-101-1/+1
|\ \ \ | |/ / |/| | Makefile: call Dialyzer with -nn flag
| * | Makefile: call Dialyzer with -nn flagTuncer Ayaz2013-03-041-1/+1
|/ / | | | | | | | | This speeds up 'make dialyzer' for the common case of Erlang/OTP built without --enable-native-libs.
* | Add travis target to make it easier to reproduce failures locallyDave Smith2013-03-042-1/+3
| |
* | Merge pull request #68 from nevar/fix_unicode_promtDave Smith2013-03-041-1/+1
|\ \ | | | | | | Fix unicode
| * | Fix handling of Unicode characters in env varsSlava Yurin2013-02-181-1/+1
| |/
* | Fix missing call to cwd_predirsDave Smith2013-03-021-2/+2
| |
* | Remove hg from integration tests; git is defacto standard at this pointDave Smith2013-03-026-11/+11
| |
* | Merge pull request #38 from tuncer/fix-sub_dir-associationDave Smith2013-03-021-24/+24
|\ \ | | | | | | rebar_core: fix sub dir association
| * | rebar_core: fix broken indentationTuncer Ayaz2013-02-261-6/+6
| | |
| * | rebar_core: remove useless return after ?ABORT callTuncer Ayaz2013-02-261-2/+1
| | |
| * | rebar_core: document pre-dirs associationTuncer Ayaz2013-02-261-16/+17
| | |
* | | Merge pull request #69 from tuncer/repo-urlDave Smith2013-03-022-4/+4
|\ \ \ | | | | | | | | Update rebar repo urls
| * | | Update rebar repo urlsTuncer Ayaz2013-03-022-4/+4
| |/ /
* | | Remove unnecessary barDave Smith2013-03-021-1/+1
| | |
* | | Merge pull request #55 from jaredmorrow/jem-simplenode-multi-platformDave Smith2013-03-024-43/+156
|\ \ \ | |/ / |/| | Change simplenode template files to work on more platforms
| * | Change simplenode template files to work on more platformsJared Morrow2013-01-174-43/+156
| |/ | | | | | | | | | | | | | | | | | | | | | | When developing Riak, we have found bugs and other issues due to the number of platforms we support. Here is an overview of the changes: - Fix command-line syntax for commands to work on *BSD / Sun - Add chkconfig and getpid to nodetool - Replace platform specific 'kill' commands with a nodetool getpid method - Fix RUNNER_USER settings to work on *BSD
* | Merge pull request #59 from Vagabond/adt-read-lists-from-filesDave Smith2013-02-261-7/+17
|\ \ | | | | | | Support reading mustache 'lists' from files
| * | Support reading mustache 'lists' from filesAndrew Thompson2013-01-301-7/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add support for reading mustache 'lists' from files, so you can use the list section functionality when templating things. An example of the list syntax is as follows: {package_commands, {list, [[{name, "riak"}], [{name, "riak-admin"}], [{name, "search-cmd"}]]}}. Then you can, for each of the list elements, render some text: {{#package_commands}} chmod +x bin/{{name}} {{/package_commands}}
* | Merge pull request #22 from tuncer/helpDave Smith2013-02-2627-33/+570
|\ \ | |/ |/| Implement 'rebar help CMD1 CMD2' and extend common 'rebar help' msg