From b1610390a0985f3fe68744aeca3e925cfebf5c9e Mon Sep 17 00:00:00 2001
From: Caridy Patino <caridy@gmail.com>
Date: Wed, 20 Aug 2014 18:19:43 -0400
Subject: [PATCH] bumping 1.1.0 after PR #29 and PR #30

---
 HISTORY.md   | 14 ++++++++++++++
 package.json |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 9c4d596..cac6436 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,20 @@
 Locator Change History
 ======================
 
+# 1.1.0
+
+PR #30: Fixes #25 - logs
+
+* relied on `debug()` to log locator warnings
+* moved logic to dedupe duplicates into its own method for better testing
+
+PR #30: Fixes #27 - method deprecation:
+
+    * listAllResources() -> getAllResources()
+    * listBundleNames() -> getBundleNames()
+
+PR #29: Fixes #25 - support rulesets generation thru `rulesetFn` configuration
+
 # 1.0.2
 
 * Use `Module._resolveFilename()` to resolve alien rulesets thru npm lookup. This
diff --git a/package.json b/package.json
index 4598e37..26d3029 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "locator",
   "description": "gives semantic meaning to filesystem paths",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "homepage": "https://github.com/yahoo/locator",
   "keywords": [
     "filesystem",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "walk": "^2.3.1",
-    "semver": "^1.1.4",
+    "semver": "^3.0.1",
     "debug": "^1.0.4"
   },
   "devDependencies": {