From 825b4d5ba3d621ab838b749fb63978f9374a6487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= <miroslav@strongloop.com>
Date: Thu, 15 Jan 2015 08:53:57 +0100
Subject: [PATCH] v2.14.1

---
 CHANGES.md   | 47 ++++++++++++++++++++++++++++++++---------------
 package.json |  2 +-
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index ab5092e0..dddfeb2b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+2015-01-15, Version 2.14.1
+==========================
+
+ * Fix detection of `util.inspect` version (Miroslav Bajtoš)
+
+ * fix recursive calls if create belongsTo model in beforeCreate hook (Clark Wang)
+
+
 2015-01-14, Version 2.14.0
 ==========================
 
@@ -321,16 +329,9 @@
 
  * Emit deleted event on delete for embedsMany relations (Jaka Hudoklin)
 
- * Make sure falsy value is kept for properties not predefined (Raymond Feng)
-
  * Add ping() to test connections (Raymond Feng)
 
 
-2014-08-21, Version 2.5.1
-=========================
-
-
-
 2014-08-21, Version 2.5.2
 =========================
 
@@ -338,6 +339,12 @@
 
  * Make sure falsy value is kept for properties not predefined (Raymond Feng)
 
+
+2014-08-21, Version 2.5.1
+=========================
+
+ * Bump version (Raymond Feng)
+
  * Fix side-effects of PR #237 - see #242 (Fabien Franzen)
 
 
@@ -902,14 +909,6 @@
 
  * JSDoc improvements (Rand McKinney)
 
- * validations: include more details in `err.message` (Miroslav Bajtoš)
-
-
-2014-05-27, Version 1.5.4
-=========================
-
- * Bump version (Raymond Feng)
-
  * Keep undefined/null values for the array type (Raymond Feng)
 
  * Remove JSDocs for scopeMethods.add(acInst) and scopeMethods.remove(acInst) (crandmck)
@@ -945,6 +944,24 @@
  * Remove remoting metadata (Ritchie Martori)
 
 
+2014-05-27, Version 1.5.4
+=========================
+
+ * Bump version (Raymond Feng)
+
+ * Keep undefined/null values for the array type (Raymond Feng)
+
+ * Remove JSDocs for scopeMethods.add(acInst) and scopeMethods.remove(acInst) (crandmck)
+
+ * Copy info from api-model.md to JSDoc (crandmck)
+
+ * validations: include more details in `err.message` (Miroslav Bajtoš)
+
+ * Add a path to show customer.orders(query, cb) (Raymond Feng)
+
+ * Add support for logical operator (AND/OR) (Raymond Feng)
+
+
 2014-05-20, Version 1.5.2
 =========================
 
diff --git a/package.json b/package.json
index fecf1d69..aaf40176 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-datasource-juggler",
-  "version": "2.14.0",
+  "version": "2.14.1",
   "description": "LoopBack DataSoure Juggler",
   "keywords": [
     "StrongLoop",