Update IDAES branch from pyomo/master#154
Merged
jsiirola merged 239 commits intoIDAESfrom IDAES-premergeJun 6, 2017
+14,054-7,189
Commits
Commits on Nov 10, 2016
Commits on Nov 20, 2016
Commits on Nov 21, 2016
Commits on Nov 26, 2016
Commits on Nov 27, 2016
Commits on Nov 29, 2016
Commits on Dec 3, 2016
Commits on Dec 5, 2016
Commits on Dec 7, 2016
Commits on Dec 9, 2016
Commits on Dec 16, 2016
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Dec 18, 2016
Commits on Dec 19, 2016
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Dec 20, 2016
Commits on Dec 22, 2016
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Dec 23, 2016
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Dec 24, 2016
Commits on Dec 28, 2016
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jan 4, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jan 5, 2017
Commits on Jan 6, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jan 18, 2017
Commits on Jan 19, 2017
Commits on Jan 20, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jan 22, 2017
Commits on Jan 23, 2017
- committed
- committed
Commits on Jan 26, 2017
Commits on Jan 28, 2017
Commits on Jan 31, 2017
Commits on Feb 2, 2017
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Feb 8, 2017
Commits on Feb 20, 2017
Commits on Feb 22, 2017
fixes CPLEXDirect plugin following changes on the recently-merged solver-available branch (pr #109). Delayed imports were not available in the global namespace on python 2.7
committedfixes CPLEXPersistent plugin following changes on the recently-merged solver-available branch (pr #109). Delayed imports were not available in the global namespace on python 2.7
committed- committed
- committed
- committed
- committed
- committed
Commits on Mar 7, 2017
Commits on Mar 8, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Mar 9, 2017
Commits on Mar 10, 2017
Commits on Mar 11, 2017
- committed
- committed
- committed
Commits on Mar 12, 2017
- committed
- committed
- committed
- committed
- committed
Commits on Mar 13, 2017
Commits on Mar 15, 2017
Commits on Mar 16, 2017
Commits on Mar 18, 2017
Commits on Mar 19, 2017
Commits on Mar 29, 2017
- committed
- committed
- committed
- committed
Commits on Mar 31, 2017
- committed
- committed
- committed
- committed
- committed
Commits on Apr 4, 2017
Commits on Apr 11, 2017
Commits on Apr 12, 2017
Commits on Apr 16, 2017
Commits on Apr 26, 2017
- committed
- committed
- committed
- authored
- committed
Commits on Apr 27, 2017
Commits on May 2, 2017
- committed
- authored
- committed
Commits on May 5, 2017
Commits on May 6, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on May 10, 2017
Commits on May 11, 2017
Commits on May 13, 2017
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on May 14, 2017
- committed
- authored
- committed
- committed
- committed
- committed
Commits on May 19, 2017
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jun 1, 2017
Commits on Jun 2, 2017
Commits on Jun 5, 2017
- committed
- committed
- committed
- committed
- committed