Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/0.4.11' into develop

  • Loading branch information...
commit 071e03d9534fcff8fe117fe35290346379c3a8a8 2 parents dc58820 + 3822d2b
@hugoduncan hugoduncan authored
Showing with 12 additions and 5 deletions.
  1. +4 −4 README.md
  2. +7 −0 doc/proposals/proposal_environment.org
  3. +1 −1  pom.xml
View
8 README.md
@@ -47,8 +47,8 @@ Installation is with maven or your favourite maven repository aware build tool.
### lein/cake project.clj
- :dependencies [[org.cloudhoist/pallet "0.4.10"]
- [org.cloudhoist/pallet-crates-all "0.4.1"]]
+ :dependencies [[org.cloudhoist/pallet "0.4.11"]
+ [org.cloudhoist/pallet-crates-all "0.4.2"]]
:repositories {"sonatype"
"http://oss.sonatype.org/content/repositories/releases"
"sonatype-snapshots"
@@ -60,12 +60,12 @@ Installation is with maven or your favourite maven repository aware build tool.
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>pallet</artifactId>
- <version>0.4.10</version>
+ <version>0.4.11</version>
</dependency>
<dependency>
<groupId>org.cloudhoist</groupId>
<artifactId>pallet-crates-all</artifactId>
- <version>0.4.1</version>
+ <version>0.4.2</version>
</dependency>
<dependencies>
View
7 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.
View
2  pom.xml
@@ -9,7 +9,7 @@
</parent>
<groupId>org.cloudhoist</groupId>
<artifactId>pallet</artifactId>
- <version>0.4.11-SNAPSHOT</version>
+ <version>0.4.12-SNAPSHOT</version>
<packaging>jar</packaging>
<name>pallet</name>
<description>
Please sign in to comment.
Something went wrong with that request. Please try again.