From 0ff7e3de911a495bea4ccdd69d72501ba115a14d Mon Sep 17 00:00:00 2001
From: Raymond Feng <raymond@strongloop.com>
Date: Wed, 14 Jan 2015 12:44:22 -0800
Subject: [PATCH] v2.14.0

---
 CHANGES.md   | 44 +++++++++++++++++++++++++++++++++-----------
 package.json |  2 +-
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8ff138aa..ab5092e0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,23 @@
+2015-01-14, Version 2.14.0
+==========================
+
+ * Remove console.log (Raymond Feng)
+
+ * Fix for #369 (Dallon Feldner)
+
+ * Fix virtual id get function. (Berkeley Martinez)
+
+ * Fix Model.prototype.inspect (Miroslav Bajtoš)
+
+ * Include property value in the error message (Miroslav Bajtoš)
+
+ * Update datasource.js (Rand McKinney)
+
+ * Change Model to BaseModel for clarity (Fabien Franzen)
+
+ * Don't coerce nested objects into Model instances (Fabien Franzen)
+
+
 2015-01-07, Version 2.13.0
 ==========================
 
@@ -368,13 +388,6 @@
 
  * Properly handle LDL for polymorphic relations (Fabien Franzen)
 
- * Check null (Raymond Feng)
-
-
-2014-08-15, Version 2.4.0
-=========================
-
-
 
 2014-08-15, Version 2.4.1
 =========================
@@ -383,6 +396,12 @@
 
  * Check null (Raymond Feng)
 
+
+2014-08-15, Version 2.4.0
+=========================
+
+ * Bump version (Raymond Feng)
+
  * Fix the test cases to avoid hard-coded ids (Raymond Feng)
 
  * Add strict flag to sortObjectsByIds (Fabien Franzen)
@@ -429,16 +448,19 @@
 
  * Cleanup mixin tests (Fabien Franzen)
 
-
-2014-08-08, Version 2.3.1
-=========================
-
  * Fix a name conflict in scope metadata (Raymond Feng)
 
 
 2014-08-08, Version 2.3.0
 =========================
 
+
+
+2014-08-08, Version 2.3.1
+=========================
+
+ * Fix a name conflict in scope metadata (Raymond Feng)
+
  * Fix the test case so that it works with other DBs (Raymond Feng)
 
  * Bump version (Raymond Feng)
diff --git a/package.json b/package.json
index e15b9492..fecf1d69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "loopback-datasource-juggler",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "LoopBack DataSoure Juggler",
   "keywords": [
     "StrongLoop",