Permalink
Browse files

Merge branch 'master' of ../pallet-wiki into release/0.4.11

  • Loading branch information...
2 parents dc58820 + 62d9c0e commit 0851b7513e129f863bd355c47f1f833e5c300f25 @hugoduncan hugoduncan committed Mar 14, 2011
Showing with 7 additions and 0 deletions.
  1. +7 −0 doc/proposals/proposal_environment.org
@@ -67,6 +67,8 @@ The :defaults map contains overriding values for the whole call.
- :blobstore :: blobstore service to use for the environment. If not specified,
then uses the :blobstore passed to converge/lift.
+- :algorithms :: algorithm seletion for pallet converge, lift, etc.
+
* effective keys
** converge and other phases
@@ -82,3 +84,8 @@ The :defaults map contains overriding values for the whole call.
:user
:compute
:blobstore
+
+* config.clj
+
+The environment key from config.clj is propogated to the environment, as is
+the environment key from within each each service definition map.

0 comments on commit 0851b75

Please sign in to comment.