0.23.1

Merge pull request #79 from fdr/runner-dead-code
Eliminate dead code
2011-10-04 09:56:39 -04:00 · 2011-10-04 05:14:50 -07:00 · 2011-10-04 00:19:04 -07:00 · 2011-09-16 18:46:10 -04:00 · 2011-09-16 18:42:57 -04:00
5 changed files with 8 additions and 11 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
  remote: .
  specs:
-    foreman (0.23.0)
+    foreman (0.23.1)
      term-ansicolor (~> 1.0.5)
      thor (>= 0.13.6)

--- a/lib/foreman/engine.rb
+++ b/lib/foreman/engine.rb
@@ -225,10 +225,6 @@ private ######################################################################
    end
  end

-  def runner
-    File.expand_path("../../../bin/foreman-runner", __FILE__)
-  end
-
  def terminate_gracefully
    info "sending SIGTERM to all processes"
    kill_all "SIGTERM"
--- a/lib/foreman/version.rb
+++ b/lib/foreman/version.rb
@@ -1,5 +1,5 @@
 module Foreman

-  VERSION = "0.23.0"
+  VERSION = "0.23.1"

 end
--- a/man/foreman.1
+++ b/man/foreman.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "September 2011" "Foreman 0.21.0" "Foreman Manual"
+.TH "FOREMAN" "1" "September 2011" "Foreman 0.23.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications
@@ -69,7 +69,7 @@ These options control all modes of foreman\'s operation\.
 .
 .TP
 \fB\-e\fR, \fB\-\-env\fR
-Specify an alternate environment file\.
+Specify an alternate environment file\. You can specify more than one file by using: \fB\-\-env file1,file2\fR\.
 .
 .TP
 \fB\-f\fR, \fB\-\-procfile\fR
@@ -165,7 +165,7 @@ If a \fB\.foreman\fR file exists in the current directory, default options will
 .
 .nf

-concurrency: alpha=0
+concurrency: alpha=0,bravo=1
 port: 15000
 .
 .fi
--- a/man/foreman.1.ronn
+++ b/man/foreman.1.ronn
@@ -67,7 +67,8 @@ The following options control how the application is run:
 These options control all modes of foreman's operation.

  * `-e`, `--env`:
-    Specify an alternate environment file.
+    Specify an alternate environment file. You can specify more than one
+    file by using: `--env file1,file2`.

  * `-f`, `--procfile`:
    Specify an alternate location for the application's Procfile. This file's
@@ -131,7 +132,7 @@ If a `.foreman` file exists in the current directory, default options will
 be read from it. This file should be in YAML format with the long option
 name as keys. Example:

-    concurrency: alpha=0
+    concurrency: alpha=0,bravo=1
    port: 15000

 ## EXAMPLES
Author	SHA1	Message	Date
David Dollar	a3e758ab6c	0.23.1	2011-10-04 09:56:39 -04:00
David Dollar	5dc232a7b1	Merge pull request #79 from fdr/runner-dead-code Eliminate dead code	2011-10-04 05:14:50 -07:00
Dan Farina	4191cb7b9c	Eliminate dead code An oversight; this code should probably have been pruned in `20e598abcc`. Signed-off-by: Dan Farina <drfarina@acm.org>	2011-10-04 00:19:04 -07:00
David Dollar	90d4dffb82	tweak docs	2011-09-16 18:46:10 -04:00
David Dollar	823f307abc	doc updates	2011-09-16 18:42:57 -04:00