From aadd05c33f9b84f7374bc1842ae4e92049dcdeab Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Fri, 24 Aug 2007 17:51:25 -0700
Subject: [PATCH] update history, manifest, and god binary usage output

---
 History.txt  | 1 +
 Manifest.txt | 3 +++
 bin/god      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/History.txt b/History.txt
index c876be7..f5347fc 100644
--- a/History.txt
+++ b/History.txt
@@ -2,6 +2,7 @@
 
 * Major Enhancements
   * Add the ability for conditions to override transition state (for exceptional cases)
+  * Implement dynamic load of config files while god is running (god load <filename>)
 * New Conditions
   * Tries < PollCondition - triggers after the specified number of tries
 * Bug Fixes
diff --git a/Manifest.txt b/Manifest.txt
index 0db9b7a..3b5bbab 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -41,7 +41,10 @@ test/configs/child_polls/child_polls.god
 test/configs/child_polls/simple_server.rb
 test/configs/daemon_events/daemon_events.god
 test/configs/daemon_events/simple_server.rb
+test/configs/daemon_polls/daemon_polls.god
+test/configs/daemon_polls/simple_server.rb
 test/configs/real.rb
+test/configs/running_load/running_load.god
 test/configs/test.rb
 test/helper.rb
 test/suite.rb
diff --git a/bin/god b/bin/god
index 43babc9..3c1ade3 100755
--- a/bin/god
+++ b/bin/god
@@ -17,6 +17,7 @@ Usage: god [command] [options]
     stop <watch or group name>
     monitor <watch or group name>
     unmonitor <watch or group name>
+    load <file>
 
   Options:
 EOF
-- 
2.11.4.GIT