adding JuMP version upper bound and next PowerModels release (#56)

ccoffrin · web-flow · commit ff95e40fa62c · 2017-01-12T10:52:30.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,12 @@
 PowerModels.jl Change Log 
 =================
 
-### staged
+### v0.2.3
 - Multiple improvements to Matlab file parsing
   - Added support matlab cell arrays
   - Added support for matpower bus_names
   - Added ability for reading non-standard matpower data elements
+- Added JuMP version v0.14 upper bound 
 
 ### v0.2.2
 - Added Transmission Network Expansion Planning (tnep) problem.
diff --git a/REQUIRE b/REQUIRE
@@ -1,5 +1,5 @@
 julia 0.4.6
 JSON 0.6.0
 MathProgBase 0.5.4
-JuMP 0.14.0
+JuMP 0.14 0.15-
 Compat 0.7.9
