Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v3.1.5 / 2014 Mar 15
+
+ * FIX: `profiling/p*` was defined incorrectly (kyptin).
+
+
 ## v3.1.4 / 2014 Mar 13
 
  * NEW: Add `profiling/p*` macro.

README.md

@@ -1,7 +1,7 @@
 **[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contributing](#contact--contributing) | current ([semantic][]) version:
 
 ```clojure
-[com.taoensso/timbre "3.1.4"] ; 3.x is a non-breaking upgrade - see CHANGELOG for details
+[com.taoensso/timbre "3.1.5"] ; 3.x is a non-breaking upgrade - see CHANGELOG for details
 ```
 
 Appender authors: please see [here](https://github.com/ptaoussanis/timbre/issues/41) about migrating Timbre 2.x appenders to 3.x's recommended style.
@@ -30,7 +30,7 @@ Logging with Java can be maddeningly, unnecessarily hard. Particularly if all yo
 Add the necessary dependency to your [Leiningen][] `project.clj` and use the supplied ns-import helper:
 
 ```clojure
-[com.taoensso/timbre "3.1.4"] ; project.clj
+[com.taoensso/timbre "3.1.5"] ; project.clj
 
 (ns my-app (:require [taoensso.timbre :as timbre])) ; Your ns
 (timbre/refer-timbre) ; Provides useful Timbre aliases in this ns

project.clj

@@ -1,4 +1,4 @@
-(defproject com.taoensso/timbre "3.1.4"
+(defproject com.taoensso/timbre "3.1.5"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure logging & profiling library"
   :url "https://github.com/ptaoussanis/timbre"

src/taoensso/timbre/profiling.clj

@@ -27,8 +27,9 @@
   of named body. Always returns the body's result."
   [id & body] `(pspy* ~id (fn [] ~@body)))
 
-(defmacro p  [id & body] `(pspy  ~id ~@body)) ; Alias
-(defmacro p* [id & body] `(pspy* ~id ~@body)) ; Alias
+;;; Aliases
+(def p* pspy*)
+(defmacro p [id & body] `(pspy ~id ~@body))
 
 (comment
   (time (dotimes [_ 1000000])) ; ~20ms