Merge branch 'release/0.1.2' into production

strongloop · Aug 5, 2014 · fce5316 · fce5316
2 parents 1cf7a91 + c9b8586
commit fce5316
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+test/.test_artifacts
diff --git a/ChangeLog → CHANGES.md b/ChangeLog → CHANGES.md
@@ -1,3 +1,11 @@
+2014-08-05, Version 0.1.2
+=========================
+
+ * Update package license to match LICENSE.md (Sam Roberts)
+
+ * package: add .gitignore file (Sam Roberts)
+
+
 2014-07-21, Version 0.1.1
 
 * Fix silent exit when run from non git repo (Krishna Raman)

diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "strong-deploy",
   "description": "Deploy a node application to a StrongLoop process manager",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/strongloop/strong-deploy.git"
   },
   "author": "Krishna Raman <kraman@strongloop.com>",
   "license": {
-    "name": "Dual MIT/StrongLoop",
+    "name": "Dual Artistic/StrongLoop",
     "url": "https://github.com/strongloop/strong-deploy/blob/master/LICENSE.md"
   },
   "readmeFilename": "README.md",